Conversion to the cmake building system.

Signed-off-by: gregory guy <gregory-tde@laposte.net>

30 files changed, 176 insertions, 167 deletions

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
new file mode 100644
index 0000000..60a21e4
--- /dev/null
+++ b/src/app/CMakeLists.txt
@@ -0,0 +1,54 @@
+include_directories(
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${TDE_INCLUDE_DIR}
+    ${TQT_INCLUDE_DIRS}
+    ${XINE_INCLUDE_DIRS}
+    ${X11_INCLUDE_DIR}
+    ${X11_XTEST_INCLUDE_DIRS}
+    ${X11_KEYSIM_INCLUDE_DIRS}
+)
+
+link_directories(
+    ${TQT_LIBRARY_DIRS}
+    ${TDE_LIB_DIR}
+)
+
+
+##### codeine (executable)
+
+tde_add_executable( ${PROJECT_NAME} AUTOMOC
+
+  SOURCES
+        xineEngine.cpp
+        xineConfig.cpp
+        xineScope.c
+        theStream.cpp
+        videoWindow.cpp
+        videoSettings.cpp
+        captureFrame.cpp
+        actions.cpp
+        stateChange.cpp
+        slider.cpp
+        analyzer.cpp
+        playDialog.cpp
+        listView.cpp
+        adjustSizeButton.cpp
+        fullScreenAction.cpp
+        insertAspectRatioMenuItems.cpp
+        playlistFile.cpp
+        volumeAction.cpp
+        ../mxcl.library.cpp
+        main.cpp
+        mainWindow.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     ${XINE_LIBRARIES}
+     ${X11_LIBRARIES}
+     ${X11_XTEST_LIBRARIES}
+		
+  DESTINATION ${BIN_INSTALL_DIR}
+)
diff --git a/src/app/SConscript b/src/app/SConscript
deleted file mode 100644
index bb402f3..0000000
--- a/src/app/SConscript
+++ /dev/null
@@ -1,59 +0,0 @@
-
-############################
-## load the config
-
-## Use the environment and the tools set in the top-level
-## SConstruct file (set with 'Export') - this is very important
-
-Import( '*' )
-myenv=env.Copy()
-
-#############################
-## the programs to build
-
-# we put the stuff that could fail due to bad xine.h locations, etc. at the beginning
-# so if the build fails the user knows quickly
-app_sources = Split("""
-	xineEngine.cpp
-	xineConfig.cpp
-	xineScope.c
-	theStream.cpp
-	videoWindow.cpp
-	videoSettings.cpp
-	captureFrame.cpp
-
-        actions.cpp
-        stateChange.cpp
-	slider.cpp
-	analyzer.cpp
-	playDialog.cpp
-	listView.cpp
-	adjustSizeButton.cpp
-	fullScreenAction.cpp
-	insertAspectRatioMenuItems.cpp
-	playlistFile.cpp
-	volumeAction.cpp
-
-        ../mxcl.library.cpp
-
-        main.cpp
-        mainWindow.cpp""")
-
-KDEprogram( "codeine", app_sources, myenv )
-
-
-############################
-## Customization
-
-## Additional include paths for compiling the source files
-## Always add '../' (top-level directory) because moc makes code that needs it
-KDEaddpaths( ['./', '../', '../../'], myenv )
-
-## Necessary libraries to link against
-KDEaddlibs( ['tqt-mt', 'tdeio', 'tdecore', 'tdeui', 'xine', 'Xtst'], myenv )
-
-## This shows how to add other link flags to the program
-myenv['LINKFLAGS'].append('-L/usr/X11R6/lib')
-
-## If you are using QThread, add this line
-# myenv.AppendUnique( CPPFLAGS = ['-DQT_THREAD_SUPPORT'] )
diff --git a/src/app/actions.cpp b/src/app/actions.cpp
index 1612a57..7447320 100644
--- a/src/app/actions.cpp
+++ b/src/app/actions.cpp
@@ -2,9 +2,9 @@
 // See COPYING file for licensing information
 
 #include "actions.h"
-#include "debug.h"
-#include "mxcl.library.h"
-#include <ntqtoolbutton.h>
+#include "../debug.h"
+#include "../mxcl.library.h"
+#include <tqtoolbutton.h>
 #include "xineEngine.h"
 
 namespace Codeine
diff --git a/src/app/adjustSizeButton.cpp b/src/app/adjustSizeButton.cpp
index 3a5c1dd..e1bf5b1 100644
--- a/src/app/adjustSizeButton.cpp
+++ b/src/app/adjustSizeButton.cpp
@@ -4,11 +4,11 @@
 #include "adjustSizeButton.h"
 #include "extern.h"
 #include <kpushbutton.h>
-#include <ntqapplication.h>
-#include <ntqevent.h>
-#include <ntqlabel.h>
-#include <ntqlayout.h>
-#include <ntqpainter.h>
+#include <tqapplication.h>
+#include <tqevent.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqpainter.h>
 #include "theStream.h"
 #include "xineEngine.h" //videoWindow()
 
diff --git a/src/app/adjustSizeButton.h b/src/app/adjustSizeButton.h
index 9becd95..0dbe432 100644
--- a/src/app/adjustSizeButton.h
+++ b/src/app/adjustSizeButton.h
@@ -4,7 +4,7 @@
 #ifndef CODEINE_ADJUST_SIZE_BUTTON_H
 #define CODEINE_ADJUST_SIZE_BUTTON_H
 
-#include <ntqframe.h>
+#include <tqframe.h>
 
 namespace Codeine
 {
diff --git a/src/app/analyzer.cpp b/src/app/analyzer.cpp
index 593bd16..9d3da06 100644
--- a/src/app/analyzer.cpp
+++ b/src/app/analyzer.cpp
@@ -2,10 +2,10 @@
 // See COPYING file for licensing information
 
 #include "analyzer.h"
-#include "codeine.h"
-#include "debug.h"
+#include "../codeine.h"
+#include "../debug.h"
 #include <math.h>       //interpolate()
-#include <ntqevent.h>     //event()
+#include <tqevent.h>     //event()
 #include "xineEngine.h"
 
 #include "fht.cpp"
@@ -83,7 +83,7 @@ Analyzer::Base2D::resizeEvent( TQResizeEvent* )
 // Author:    Max Howell <max.howell@methylblue.com>, (C) 2003
 // Copyright: See COPYING file that comes with this distribution
 
-#include <ntqpainter.h>
+#include <tqpainter.h>
 
 Analyzer::Block::Block( TQWidget *parent )
       : Analyzer::Base2D( parent, 20 )
@@ -108,7 +108,7 @@ Analyzer::Block::transform( Analyzer::Scope &scope ) //pure virtual
    fht.scale( front, 1.0 / 40 );
 }
 
-#include <math.h>
+
 void
 Analyzer::Block::analyze( const Analyzer::Scope &s )
 {
@@ -129,3 +129,5 @@ Analyzer::Block::heightForWidth( int w ) const
 {
    return w / 2;
 }
+
+#include "analyzer.moc"
diff --git a/src/app/analyzer.h b/src/app/analyzer.h
index edd526e..9a5af00 100644
--- a/src/app/analyzer.h
+++ b/src/app/analyzer.h
@@ -8,9 +8,9 @@
    #include <sys/types.h>

 #endif

 

-#include <ntqpixmap.h> //stack allocated and convenience

-#include <ntqtimer.h>  //stack allocated

-#include <ntqwidget.h> //baseclass

+#include <tqpixmap.h> //stack allocated and convenience

+#include <tqtimer.h>  //stack allocated

+#include <tqwidget.h> //baseclass

 #include <vector>    //included for convenience

 

 namespace Analyzer

diff --git a/src/app/captureFrame.cpp b/src/app/captureFrame.cpp
index 6043b76..3be0e9f 100644
--- a/src/app/captureFrame.cpp
+++ b/src/app/captureFrame.cpp
@@ -1,21 +1,21 @@
 // (C) 2005 Max Howell (max.howell@methylblue.com)
 // See COPYING file for licensing information
 
-#include "debug.h"
+#include "../debug.h"
 #include <tdefiledialog.h>
 #include <kpreviewwidgetbase.h>
 #include <kpushbutton.h>
 #include <kstatusbar.h>
 #include <kstdguiitem.h>
 #include "mainWindow.h"
-#include "mxcl.library.h"
-#include <ntqdialog.h>
-#include <ntqhbox.h>
-#include <ntqlabel.h>
-#include <ntqimage.h>
-#include <ntqlayout.h>
-#include <ntqpainter.h>
-#include <ntqstringlist.h>
+#include "../mxcl.library.h"
+#include <tqdialog.h>
+#include <tqhbox.h>
+#include <tqlabel.h>
+#include <tqimage.h>
+#include <tqlayout.h>
+#include <tqpainter.h>
+#include <tqstringlist.h>
 #include "theStream.h"
 #include "xineEngine.h"
 #include <xine.h>
diff --git a/src/app/config.h b/src/app/codeineConfig.h
index 4ac877c..4ac877c 100644
--- a/src/app/config.h
+++ b/src/app/codeineConfig.h
diff --git a/src/app/fullScreenAction.cpp b/src/app/fullScreenAction.cpp
index 3787a33..006164d 100644
--- a/src/app/fullScreenAction.cpp
+++ b/src/app/fullScreenAction.cpp
@@ -5,7 +5,7 @@
 #include "fullScreenAction.h"
 #include <tdelocale.h>
 #include <twin.h>
-#include <ntqwidget.h>
+#include <tqwidget.h>
 #include "xineEngine.h" //videoWindow()
 
 
diff --git a/src/app/insertAspectRatioMenuItems.cpp b/src/app/insertAspectRatioMenuItems.cpp
index 2e2824c..81ad0b3 100644
--- a/src/app/insertAspectRatioMenuItems.cpp
+++ b/src/app/insertAspectRatioMenuItems.cpp
@@ -1,7 +1,7 @@
 // Copyright 2005 Max Howell (max.howell@methylblue.com)
 // See COPYING file for licensing information
 
-#include <ntqpopupmenu.h>
+#include <tqpopupmenu.h>
 #include <xine.h>
 
 TQString i18n( const char *text );
diff --git a/src/app/main.cpp b/src/app/main.cpp
index a024d5d..299df88 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -1,7 +1,7 @@
 // (c) 2004 Max Howell (max.howell@methylblue.com)
 // See COPYING file for licensing information
 
-#include "codeine.h"
+#include "../codeine.h"
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
@@ -13,8 +13,8 @@ static TDEAboutData aboutData( APP_NAME,
       I18N_NOOP(PRETTY_NAME), APP_VERSION,
       I18N_NOOP("A video player that has a usability focus"), TDEAboutData::License_GPL_V2,
       I18N_NOOP("Copyright 2006, Max Howell"), 0,
-      "http://www.methylblue.com/codeine/",
-      "codeine@methylblue.com" );
+      "https://mirror.git.trinitydesktop.org/gitea/TDE/codeine",
+      0 );
 
 static const TDECmdLineOptions options[] = {
    { "+[URL]", I18N_NOOP( "Play 'URL'" ), 0 },
diff --git a/src/app/mainWindow.cpp b/src/app/mainWindow.cpp
index ac054ac..b31806b 100644
--- a/src/app/mainWindow.cpp
+++ b/src/app/mainWindow.cpp
@@ -1,12 +1,15 @@
 // (C) 2005 Max Howell (max.howell@methylblue.com)
 // See COPYING file for licensing information
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "actions.h"
 #include "analyzer.h"
-#include "config.h"
-#include "configure.h"
+#include "codeineConfig.h"
 #include <cstdlib>
-#include "debug.h"
+#include "../debug.h"
 #include "extern.h"       //dialog creation function definitions
 #include "fullScreenAction.h"
 #include <tdeapplication.h>
@@ -23,13 +26,13 @@
 #include "mainWindow.h"
 #include "playDialog.h"  //::play()
 #include "playlistFile.h"
-#include "mxcl.library.h"
-#include <ntqcstring.h>
-#include <ntqdesktopwidget.h>
-#include <ntqevent.h>      //::stateChanged()
-#include <ntqlayout.h>     //ctor
-#include <ntqpopupmenu.h>  //because XMLGUI is poorly designed
-#include <ntqobjectlist.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 "slider.h"
 #include "theStream.h"
 #include "volumeAction.h"
@@ -712,3 +715,5 @@ action( const char *name )
 }
 
 } //namespace Codeine
+
+#include "mainWindow.moc"
diff --git a/src/app/mainWindow.h b/src/app/mainWindow.h
index a6c7d48..0b44d0c 100644
--- a/src/app/mainWindow.h
+++ b/src/app/mainWindow.h
@@ -4,7 +4,7 @@
 #ifndef CODEINEMAINWINDOW_H
 #define CODEINEMAINWINDOW_H
 
-#include "codeine.h"
+#include "../codeine.h"
 #include <tdemainwindow.h>
 
 class KURL;
diff --git a/src/app/playDialog.cpp b/src/app/playDialog.cpp
index b6cacaa..ab650b9 100644
--- a/src/app/playDialog.cpp
+++ b/src/app/playDialog.cpp
@@ -1,7 +1,7 @@
 // (C) 2005 Max Howell (max.howell@methylblue.com)
 // See COPYING file for licensing information
 
-#include "config.h"
+#include "codeineConfig.h"
 #include "listView.cpp"
 #include <tdeapplication.h>
 #include <tdeconfig.h>
@@ -10,11 +10,11 @@
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 #include "playDialog.h"
-#include "mxcl.library.h"
-#include <ntqfile.h>
-#include <ntqlabel.h>
-#include <ntqlayout.h>
-#include <ntqsignalmapper.h>
+#include "../mxcl.library.h"
+#include <tqfile.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqsignalmapper.h>
 
 TQString i18n( const char *text );
 
@@ -112,3 +112,5 @@ PlayDialog::done( TQListViewItem *item )
 }
 
 }
+
+#include "playDialog.moc"
diff --git a/src/app/playDialog.h b/src/app/playDialog.h
index 2bbc37d..1c84e2d 100644
--- a/src/app/playDialog.h
+++ b/src/app/playDialog.h
@@ -5,7 +5,7 @@
 #define CODEINEPLAYDIALOG_H
 
 #include <kurl.h>
-#include <ntqdialog.h>
+#include <tqdialog.h>
 
 class TDEListView;
 class TQBoxLayout;
diff --git a/src/app/playlistFile.cpp b/src/app/playlistFile.cpp
index 83b1f5d..d520fa2 100644
--- a/src/app/playlistFile.cpp
+++ b/src/app/playlistFile.cpp
@@ -5,13 +5,13 @@
 //TODO error messages that vary depending on if the file is remote or not
 
 
-#include "codeine.h"
-#include "debug.h"
+#include "../codeine.h"
+#include "../debug.h"
 #include <tdeio/netaccess.h>
 #include "playlistFile.h"
-#include <ntqfile.h>
-#include <ntqtextstream.h>
-#include <mxcl.library.h>
+#include <tqfile.h>
+#include <tqtextstream.h>
+#include "../mxcl.library.h"
 
 
 PlaylistFile::PlaylistFile( const KURL &url )
diff --git a/src/app/slider.cpp b/src/app/slider.cpp
index 205a3b8..172c15d 100644
--- a/src/app/slider.cpp
+++ b/src/app/slider.cpp
@@ -1,14 +1,14 @@
 // (c) 2004 Max Howell (max.howell@methylblue.com)
 // See COPYING file for licensing information
 
-#include "debug.h"
+#include "../debug.h"
 #include "slider.h"
-#include <ntqapplication.h>
-#include <ntqlabel.h>
-#include <ntqsize.h>
-#include <ntqtooltip.h>
+#include <tqapplication.h>
+#include <tqlabel.h>
+#include <tqsize.h>
+#include <tqtooltip.h>
 
-#include <ntqpainter.h>
+#include <tqpainter.h>
 #include "xineEngine.h"
 
 using Codeine::Slider;
@@ -143,3 +143,5 @@ Slider::setValue( int newValue )
    else
       m_prevValue = newValue;
 }
+
+#include "slider.moc"
diff --git a/src/app/slider.h b/src/app/slider.h
index b7cbae0..e739d72 100644
--- a/src/app/slider.h
+++ b/src/app/slider.h
@@ -4,7 +4,7 @@
 #ifndef CODEINESLIDER_H
 #define CODEINESLIDER_H
 
-#include <ntqslider.h>
+#include <tqslider.h>
 
 namespace Codeine
 {
diff --git a/src/app/stateChange.cpp b/src/app/stateChange.cpp
index d547ff1..15846f5 100644
--- a/src/app/stateChange.cpp
+++ b/src/app/stateChange.cpp
@@ -3,16 +3,16 @@
 
 #include "actions.h"
 #include "adjustSizeButton.h"
-#include "debug.h"
+#include "../debug.h"
 #include "mainWindow.h"
 #include <tdeconfig.h>
 #include <tdeglobal.h>
-#include "mxcl.library.h"
-#include <ntqapplication.h>
-#include <ntqevent.h>
-#include <ntqlabel.h>
-#include <ntqpopupmenu.h>
-#include <ntqslider.h>
+#include "../mxcl.library.h"
+#include <tqapplication.h>
+#include <tqevent.h>
+#include <tqlabel.h>
+#include <tqpopupmenu.h>
+#include <tqslider.h>
 #include "theStream.h"
 #include "videoSettings.h" //FIXME unfortunate
 #include "xineEngine.h"
diff --git a/src/app/theStream.cpp b/src/app/theStream.cpp
index 246e84d..fbb35ac 100644
--- a/src/app/theStream.cpp
+++ b/src/app/theStream.cpp
@@ -2,7 +2,7 @@
 // See COPYING file for licensing information
 
 #include <kurl.h>
-#include "mxcl.library.h"
+#include "../mxcl.library.h"
 #include "theStream.h"
 #include <xine.h>
 #include "xineEngine.h"
diff --git a/src/app/theStream.h b/src/app/theStream.h
index c71b5e8..7679a10 100644
--- a/src/app/theStream.h
+++ b/src/app/theStream.h
@@ -4,10 +4,10 @@
 #ifndef CODEINE_THESTREAM_H

 #define CODEINE_THESTREAM_H

 

-#include "config.h"  // needed for inline functions

+#include "codeineConfig.h"  // needed for inline functions

 #include <kurl.h>    // larger :( but no macros at least

-#include <ntqsize.h>   // small header

-#include <ntqstring.h> // small header

+#include <tqsize.h>   // small header

+#include <tqstring.h> // small header

 

 /// for purely static classes

 #define CODEINE_NO_EXPORT( T ) \

diff --git a/src/app/videoSettings.cpp b/src/app/videoSettings.cpp
index 19323d8..cf759c2 100644
--- a/src/app/videoSettings.cpp
+++ b/src/app/videoSettings.cpp
@@ -2,10 +2,10 @@
 // See COPYING file for licensing information
 
 #include <twin.h>
-#include "mxcl.library.h"
-#include <ntqlabel.h>
-#include <ntqlayout.h>
-#include <ntqslider.h>
+#include "../mxcl.library.h"
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqslider.h>
 #include "videoSettings.h"
 #include <xine.h>
 #include "xineEngine.h"
diff --git a/src/app/videoSettings.h b/src/app/videoSettings.h
index c781169..0568cde 100644
--- a/src/app/videoSettings.h
+++ b/src/app/videoSettings.h
@@ -4,7 +4,7 @@
 #ifndef CODEINE_VIDEO_SETTINGS_H
 #define CODEINE_VIDEO_SETTINGS_H
 
-#include "codeine.h"
+#include "../codeine.h"
 #include <kdialog.h>
 
 
diff --git a/src/app/videoWindow.cpp b/src/app/videoWindow.cpp
index 0e7d19f..2ecf65a 100644
--- a/src/app/videoWindow.cpp
+++ b/src/app/videoWindow.cpp
@@ -6,15 +6,15 @@
 #include "actions.h"
 #include <cmath> //std::log10
 #include <cstdlib>
-#include "debug.h"
+#include "../debug.h"
 #include <tdeapplication.h> //::makeStandardCaption
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
 #include <twin.h>
-#include "mxcl.library.h"
-#include <ntqcursor.h>
-#include <ntqevent.h>
+#include "../mxcl.library.h"
+#include <tqcursor.h>
+#include <tqevent.h>
 #include "slider.h"
 #include "theStream.h"
 #include <X11/Xlib.h>
diff --git a/src/app/volumeAction.cpp b/src/app/volumeAction.cpp
index f9a1951..0c0b81c 100644
--- a/src/app/volumeAction.cpp
+++ b/src/app/volumeAction.cpp
@@ -3,14 +3,14 @@
 
 #include <tdelocale.h>
 #include <tdetoolbar.h>
-#include <ntqevent.h>
-#include <ntqlabel.h>
-#include <ntqlayout.h>
-#include <ntqslider.h>
+#include <tqevent.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqslider.h>
 
-#include "debug.h"
+#include "../debug.h"
 #include "volumeAction.h"
-#include "volumeAction.moc"
+
 #include "xineEngine.h"
 
 
@@ -112,3 +112,5 @@ VolumeAction::eventFilter( TQObject *o, TQEvent *e )
          return false;
    }
 }
+
+#include "volumeAction.moc"
diff --git a/src/app/xineConfig.cpp b/src/app/xineConfig.cpp
index 07d402f..7be1c76 100644
--- a/src/app/xineConfig.cpp
+++ b/src/app/xineConfig.cpp
@@ -1,21 +1,21 @@
 // (C) 2005 Max Howell (max.howell@methylblue.com)
 // See COPYING file for licensing information
 
-#include "debug.h"
+#include "../debug.h"
 #include <tdeapplication.h> // XineConfigDialog::ctor -> to get the iconloader
 #include <kcombobox.h>
 #include <kiconloader.h>  // XineConfigDialog::ctor
 #include <klineedit.h>
 #include <kseparator.h>
 #include <kstdguiitem.h>
-#include <ntqcheckbox.h>
-#include <ntqlabel.h>
-#include <ntqlayout.h>
-#include <ntqscrollview.h>
-#include <ntqspinbox.h>
-#include <ntqtabwidget.h>
-#include <ntqtooltip.h>
-#include <ntqvbox.h>
+#include <tqcheckbox.h>
+#include <tqlabel.h>
+#include <tqlayout.h>
+#include <tqscrollview.h>
+#include <tqspinbox.h>
+#include <tqtabwidget.h>
+#include <tqtooltip.h>
+#include <tqvbox.h>
 #include <xine.h>
 #include "xineConfig.h"
 
@@ -185,7 +185,7 @@ XineConfigDialog::isUnsavedSettings() const
    return false;
 }
 
-#include <ntqdir.h>
+#include <tqdir.h>
 void
 XineConfigDialog::saveSettings()
 {
diff --git a/src/app/xineConfig.h b/src/app/xineConfig.h
index 7eb9ab8..5dc05f2 100644
--- a/src/app/xineConfig.h
+++ b/src/app/xineConfig.h
@@ -5,7 +5,7 @@
 #define XINECONFIG_H
 
 #include <kdialogbase.h>
-#include <ntqptrlist.h>
+#include <tqptrlist.h>
 
 class KComboBox;
 class KLineEdit;
diff --git a/src/app/xineEngine.cpp b/src/app/xineEngine.cpp
index 9a7b709..295d155 100644
--- a/src/app/xineEngine.cpp
+++ b/src/app/xineEngine.cpp
@@ -5,14 +5,14 @@
 
 #include "actions.h"      //::seek() FIXME unfortunate
 #include <cmath>          //the fade out
-#include "config.h"
-#include "debug.h"
+#include "codeineConfig.h"
+#include "../debug.h"
 #include <limits>
 #include <tdelocale.h>
-#include "mxcl.library.h"
-#include <ntqapplication.h> //::sendEvent()
-#include <ntqdatetime.h>    //record()
-#include <ntqdir.h>         //::exists()
+#include "../mxcl.library.h"
+#include <tqapplication.h> //::sendEvent()
+#include <tqdatetime.h>    //record()
+#include <tqdir.h>         //::exists()
 #include "slider.h"
 #include "theStream.h"
 #include <xine.h>
@@ -21,7 +21,6 @@
 #include <unistd.h>
 #include <cstdlib>
 
-
 #define XINE_SAFE_MODE 1
 
 extern "C" { void _debug( const char *string ) { debug() << string; } } //FIXME
@@ -876,3 +875,5 @@ VideoWindow::fileFilter() const
 }
 
 } //namespace Codeine
+
+#include "xineEngine.moc"
diff --git a/src/app/xineEngine.h b/src/app/xineEngine.h
index f1b49c3..57017ce 100644
--- a/src/app/xineEngine.h
+++ b/src/app/xineEngine.h
@@ -4,9 +4,9 @@
 #ifndef CODEINE_VIDEOWINDOW_H
 #define CODEINE_VIDEOWINDOW_H
 
-#include "codeine.h"
-#include <ntqtimer.h>
-#include <ntqwidget.h>
+#include "../codeine.h"
+#include <tqtimer.h>
+#include <tqwidget.h>
 #include <kurl.h>
 #include <stdint.h>
 #include <vector>