summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/Makefile.am6
-rw-r--r--client/aboutwindow.cc4
-rw-r--r--client/aboutwindow.h4
-rw-r--r--client/cprlisten.cc1
-rw-r--r--client/cprlisten.h1
-rw-r--r--client/cprquerydialog.cc4
-rw-r--r--client/cprquerydialog.h5
-rw-r--r--client/decoder.cc1
-rw-r--r--client/decoder.h1
-rw-r--r--client/dv1394.cc5
-rw-r--r--client/dv1394.h4
-rw-r--r--client/dvfile.cc1
-rw-r--r--client/dvfile.h1
-rw-r--r--client/historyframe.cc1
-rw-r--r--client/historyframe.h1
-rw-r--r--client/historywidget.h1
-rw-r--r--client/info_gui.cc5
-rw-r--r--client/info_gui.h4
-rw-r--r--client/mainwindow.cc2
-rw-r--r--client/mainwindow.h1
-rw-r--r--client/messagebox.cc4
-rw-r--r--client/messagebox.h4
-rw-r--r--client/miav_client.cc2
-rw-r--r--client/networksender.cc1
-rw-r--r--client/networksender.h1
-rw-r--r--client/player.cc1
-rw-r--r--client/player.h1
-rw-r--r--client/splashscreen.cc1
-rw-r--r--client/splashscreen.h1
-rw-r--r--client/videowidget.h1
-rw-r--r--client/yuv_draw.cc4
-rw-r--r--client/yuv_draw.h3
32 files changed, 3 insertions, 74 deletions
diff --git a/client/Makefile.am b/client/Makefile.am
index c815678..7d170fe 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -6,7 +6,7 @@ AM_CXXFLAGS := -I../lib -L../lib \
bin_PROGRAMS = miav_client
-miav_client_SOURCES = $(shell if [ $QT_CXXFLAGS ] ; then ../tools/MocList cc; fi ) \
+miav_client_SOURCES = $(shell ../tools/MocList cc ) \
miav_client.cc \
aboutwindow.cc \
cprlisten.cc \
@@ -44,12 +44,12 @@ EXTRA_DIST = \
videowidget.h \
yuv_draw.h
-miav_client_LDADD := $(shell if [ $QT_CXXFLAGS ] ; then ../tools/MocList o; fi ) \
+miav_client_LDADD := $(shell ../tools/MocList o ) \
../lib/libmiav.la \
$(SDL_LIBS) \
$(QT_LDADD)
-miav_client_MOC = $(shell if [ $QT_CXXFLAGS ] ; then ../tools/MocList cc; fi )
+miav_client_MOC = $(shell ../tools/MocList cc )
BUILT_SOURCES = $(miav_MOC)
diff --git a/client/aboutwindow.cc b/client/aboutwindow.cc
index 9be7c32..0d6ca8f 100644
--- a/client/aboutwindow.cc
+++ b/client/aboutwindow.cc
@@ -24,9 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include <config.h>
-#ifdef USE_GUI
-
#include "aboutwindow.h"
#include <QPainter>
@@ -91,4 +88,3 @@ void AboutWindow::paintEvent( QPaintEvent *event )
painter.end();
}
-#endif /*USE_GUI*/
diff --git a/client/aboutwindow.h b/client/aboutwindow.h
index a062302..f90911a 100644
--- a/client/aboutwindow.h
+++ b/client/aboutwindow.h
@@ -24,9 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "config.h"
-#ifdef USE_GUI
-
#ifndef __ABOUTWINDOW_H__
#define __ABOUTWINDOW_H__
@@ -78,4 +75,3 @@ private:
#endif /* __ABOUTWINDOW_H__ */
-#endif /*USE_GUI*/
diff --git a/client/cprlisten.cc b/client/cprlisten.cc
index 035269a..9f31ea8 100644
--- a/client/cprlisten.cc
+++ b/client/cprlisten.cc
@@ -24,7 +24,6 @@
* along with it; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
#include "cprlisten.h"
#include "aa_socket.h"
diff --git a/client/cprlisten.h b/client/cprlisten.h
index 22cc742..f21a850 100644
--- a/client/cprlisten.h
+++ b/client/cprlisten.h
@@ -24,7 +24,6 @@
* along with it; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-
#ifndef __AASIMON_FRAMEWORK_CPRLISTEN_H__
#define __AASIMON_FRAMEWORK_CPRLISTEN_H__
diff --git a/client/cprquerydialog.cc b/client/cprquerydialog.cc
index 47224f0..0a88b43 100644
--- a/client/cprquerydialog.cc
+++ b/client/cprquerydialog.cc
@@ -24,9 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include <config.h>
-#ifdef USE_GUI
-
#include <QFrame>
#include "messagebox.h"
@@ -488,4 +485,3 @@ void CPRQueryDialog::cprSocket_timeout()
accept();
}
-#endif /* USE_GUI */
diff --git a/client/cprquerydialog.h b/client/cprquerydialog.h
index 1c4d67b..7c36b90 100644
--- a/client/cprquerydialog.h
+++ b/client/cprquerydialog.h
@@ -24,9 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "config.h"
-#ifdef USE_GUI
-
#ifndef __MIAV_CPRQUERYDIALOG_H__
#define __MIAV_CPRQUERYDIALOG_H__
@@ -143,6 +140,4 @@ private:
QTimer *timer;
};
-#endif /* USE_GUI */
-
#endif/*__MIAV_CPRQUERYDIALOG_H__*/
diff --git a/client/decoder.cc b/client/decoder.cc
index 85661ca..d4d1d15 100644
--- a/client/decoder.cc
+++ b/client/decoder.cc
@@ -24,7 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "config.h"
#include "decoder.h"
#include "info.h"
diff --git a/client/decoder.h b/client/decoder.h
index 8162980..78caa59 100644
--- a/client/decoder.h
+++ b/client/decoder.h
@@ -24,7 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "config.h"
#ifndef __MIAV_DECODER_H__
#define __MIAV_DECODER_H__
diff --git a/client/dv1394.cc b/client/dv1394.cc
index ea32f7a..e463c54 100644
--- a/client/dv1394.cc
+++ b/client/dv1394.cc
@@ -24,14 +24,10 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include <config.h>
#include "dv1394.h"
-#ifdef USE_GUI
-
#include "dv.h"
-
#include <stdlib.h>
#include <memory.h>
#include <stdio.h>
@@ -171,4 +167,3 @@ unsigned char *dv1394::readFrame()
return ptr;
}
-#endif/*USE_GUI*/
diff --git a/client/dv1394.h b/client/dv1394.h
index c7f0711..8485638 100644
--- a/client/dv1394.h
+++ b/client/dv1394.h
@@ -24,12 +24,9 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "config.h"
#ifndef __MIAV_DV1394_H__
#define __MIAV_DV1394_H__
-#ifdef USE_GUI
-
#include "frame_stream.h"
#include <libraw1394/raw1394.h>
@@ -51,4 +48,3 @@ private:
};
#endif/*__MIAV_DV1394_H__*/
-#endif/*USE_GUI*/
diff --git a/client/dvfile.cc b/client/dvfile.cc
index 2f13e5e..676d6b1 100644
--- a/client/dvfile.cc
+++ b/client/dvfile.cc
@@ -24,7 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "config.h"
#include "dvfile.h"
#include "dv.h"
diff --git a/client/dvfile.h b/client/dvfile.h
index 72d4bec..9eedd00 100644
--- a/client/dvfile.h
+++ b/client/dvfile.h
@@ -24,7 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "config.h"
#ifndef __MIAV_DVFILE_H__
#define __MIAV_DVFILE_H__
diff --git a/client/historyframe.cc b/client/historyframe.cc
index 8c67c66..cbe7c66 100644
--- a/client/historyframe.cc
+++ b/client/historyframe.cc
@@ -24,7 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "config.h"
#include "historyframe.h"
#include <QVBoxLayout>
diff --git a/client/historyframe.h b/client/historyframe.h
index 696b8fc..2cd88c6 100644
--- a/client/historyframe.h
+++ b/client/historyframe.h
@@ -24,7 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "config.h"
#ifndef __MIAV_HISTORYFRAME_H__
#define __MIAV_HISTORYFRAME_H__
diff --git a/client/historywidget.h b/client/historywidget.h
index 734935b..74f5e94 100644
--- a/client/historywidget.h
+++ b/client/historywidget.h
@@ -24,7 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "config.h"
#ifndef __MIAV_HISTORYWIDGET_H__
#define __MIAV_HISTORYWIDGET_H__
diff --git a/client/info_gui.cc b/client/info_gui.cc
index f836a92..ac733ff 100644
--- a/client/info_gui.cc
+++ b/client/info_gui.cc
@@ -24,9 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include <config.h>
-#ifdef USE_GUI
-
#include "info_gui.h"
#include <stdio.h>
@@ -122,5 +119,3 @@ void InfoGui::info(char *fmt, ...)
log("Info: %s", buf);
}
-
-#endif/*USE_GUI*/
diff --git a/client/info_gui.h b/client/info_gui.h
index e429e87..ee8d045 100644
--- a/client/info_gui.h
+++ b/client/info_gui.h
@@ -24,12 +24,9 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "config.h"
#ifndef __MIAV_INFO_GUI_H__
#define __MIAV_INFO_GUI_H__
-#ifdef USE_GUI
-
#define TXT_ERROR_TITLE "Der er opstået en fejl!"
#define TXT_WARNING_TITLE "Advarsel"
#define TXT_INFO_TITLE "Information"
@@ -86,4 +83,3 @@ private:
#endif/*__MIAV_INFO_GUI_H__*/
-#endif/*USE_GUI*/
diff --git a/client/mainwindow.cc b/client/mainwindow.cc
index 9970568..08d68f9 100644
--- a/client/mainwindow.cc
+++ b/client/mainwindow.cc
@@ -24,8 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include <config.h>
-
#include "mainwindow.h"
#include "info.h"
#include "miav_config.h"
diff --git a/client/mainwindow.h b/client/mainwindow.h
index 4222b3d..b4ce7e1 100644
--- a/client/mainwindow.h
+++ b/client/mainwindow.h
@@ -24,7 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "config.h"
#ifndef __MIAV_MAINWINDOW_H__
#define __MIAV_MAINWINDOW_H__
diff --git a/client/messagebox.cc b/client/messagebox.cc
index 11686c7..80f902d 100644
--- a/client/messagebox.cc
+++ b/client/messagebox.cc
@@ -24,8 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include <config.h>
-#ifdef USE_GUI
#include "messagebox.h"
#include "miav_config.h"
@@ -241,5 +239,3 @@ void MessageBox::bmaybe_clicked()
{
done(MSG_MAYBE);
}
-
-#endif/*USE_GUI*/
diff --git a/client/messagebox.h b/client/messagebox.h
index 2ac1d12..332f9a0 100644
--- a/client/messagebox.h
+++ b/client/messagebox.h
@@ -24,9 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "config.h"
-#ifdef USE_GUI
-
#ifndef __MIAV_MESSAGEBOX_H__
#define __MIAV_MESSAGEBOX_H__
@@ -109,4 +106,3 @@ private:
#endif/*__MIAV_MESSAGEBOX_H__*/
-#endif /*USE_GUI*/
diff --git a/client/miav_client.cc b/client/miav_client.cc
index eea9cdf..756b434 100644
--- a/client/miav_client.cc
+++ b/client/miav_client.cc
@@ -24,8 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include <config.h>
-
#include <QApplication>
#include "mainwindow.h"
diff --git a/client/networksender.cc b/client/networksender.cc
index 7e367f1..7b286aa 100644
--- a/client/networksender.cc
+++ b/client/networksender.cc
@@ -24,7 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "config.h"
#include "networksender.h"
#include "info.h"
diff --git a/client/networksender.h b/client/networksender.h
index c5dacee..9276ea3 100644
--- a/client/networksender.h
+++ b/client/networksender.h
@@ -24,7 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "config.h"
#ifndef __MIAV_NETWORKSENDER_H__
#define __MIAV_NETWORKSENDER_H__
diff --git a/client/player.cc b/client/player.cc
index 143279f..4e33c76 100644
--- a/client/player.cc
+++ b/client/player.cc
@@ -24,7 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "config.h"
#include "player.h"
#include "info.h"
diff --git a/client/player.h b/client/player.h
index 97b08a0..f8497d0 100644
--- a/client/player.h
+++ b/client/player.h
@@ -24,7 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "config.h"
#ifndef __MIAV_PLAYER_H__
#define __MIAV_PLAYER_H__
diff --git a/client/splashscreen.cc b/client/splashscreen.cc
index 7b23609..7349a43 100644
--- a/client/splashscreen.cc
+++ b/client/splashscreen.cc
@@ -24,7 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "config.h"
#include "splashscreen.h"
#include <QApplication>
diff --git a/client/splashscreen.h b/client/splashscreen.h
index 529f8cb..eff1887 100644
--- a/client/splashscreen.h
+++ b/client/splashscreen.h
@@ -24,7 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "config.h"
#ifndef __MIAV_SPLASHSCREEN_H__
#define __MIAV_SPLASHSCREEN_H__
diff --git a/client/videowidget.h b/client/videowidget.h
index e2b597a..1647e28 100644
--- a/client/videowidget.h
+++ b/client/videowidget.h
@@ -24,7 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "config.h"
#ifndef __VIDEOWIDGET_H__
#define __VIDEOWIDGET_H__
diff --git a/client/yuv_draw.cc b/client/yuv_draw.cc
index 74f8dcf..7cc2f4c 100644
--- a/client/yuv_draw.cc
+++ b/client/yuv_draw.cc
@@ -24,8 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "config.h"
-#ifdef USE_GUI
#include "yuv_draw.h"
#include <string.h>
@@ -238,5 +236,3 @@ typedef struct{
Uint32 hw_overlay:1;
} SDL_Overlay;
*/
-
-#endif/*USE_GUI*/
diff --git a/client/yuv_draw.h b/client/yuv_draw.h
index 9f70798..7bbc99b 100644
--- a/client/yuv_draw.h
+++ b/client/yuv_draw.h
@@ -24,8 +24,6 @@
* along with MIaV; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
*/
-#include "config.h"
-#ifdef USE_GUI
#ifndef __MIAV_YUV_DRAW_H__
#define __MIAV_YUV_DRAW_H__
@@ -67,4 +65,3 @@ private:
};
#endif/*__MIAV_YUV_DRAW_H__*/
-#endif/*USE_GUI*/
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 01:00:10 +0000