summaryrefslogtreecommitdiffstats
path: root/src/app/mainWindow.cpp
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2020-06-29 19:14:27 +0200
committerSlávek Banko <slavek.banko@axis.cz>2020-06-29 19:14:27 +0200
commit4ca91724d7700edb009a3037c7020aa033ce14d7 (patch)
tree7bda9d552603888a4805b5c3fec4bdde10947ae7 /src/app/mainWindow.cpp
parent7090ff34ea4f78bb5ae8a2b644ed44893996cce6 (diff)
downloadcodeine-4ca91724d7700edb009a3037c7020aa033ce14d7.tar.gz
codeine-4ca91724d7700edb009a3037c7020aa033ce14d7.zip
Drop the use of the HAVE_XINE_H definition.
Add include <xine.h> to the appropriate headers. Clean up the arrangement of include files. Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
Diffstat (limited to 'src/app/mainWindow.cpp')
-rw-r--r--src/app/mainWindow.cpp22
1 files changed, 12 insertions, 10 deletions
diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp
index b31806b..af41a4f 100644
--- a/src/app/mainWindow.cpp
+++ b/src/app/mainWindow.cpp
@@ -5,13 +5,7 @@
#include "config.h"
#endif
-#include "actions.h"
-#include "analyzer.h"
-#include "codeineConfig.h"
#include <cstdlib>
-#include "../debug.h"
-#include "extern.h" //dialog creation function definitions
-#include "fullScreenAction.h"
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <kcursor.h>
@@ -23,21 +17,29 @@
#include <tdetoolbar.h>
#include <kurldrag.h>
#include <twin.h>
-#include "mainWindow.h"
-#include "playDialog.h" //::play()
-#include "playlistFile.h"
-#include "../mxcl.library.h"
#include <tqcstring.h>
#include <tqdesktopwidget.h>
#include <tqevent.h> //::stateChanged()
#include <tqlayout.h> //ctor
#include <tqpopupmenu.h> //because XMLGUI is poorly designed
#include <tqobjectlist.h>
+
+#include "../debug.h"
+#include "../mxcl.library.h"
+#include "actions.h"
+#include "analyzer.h"
+#include "codeineConfig.h"
+#include "extern.h" //dialog creation function definitions
+#include "fullScreenAction.h"
+#include "mainWindow.h"
+#include "playDialog.h" //::play()
+#include "playlistFile.h"
#include "slider.h"
#include "theStream.h"
#include "volumeAction.h"
#include "xineEngine.h"
+
#ifndef NO_XTEST_EXTENSION
extern "C"
{