include path changes

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@250 90c681e8-e032-0410-971d-27865f9a5e38

19 files changed, 63 insertions, 57 deletions

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index a9a9f7bc2..8cc1a1aa2 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -19,7 +19,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 
 # libqmmp & libqmmpui
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/../qmmp)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/../)
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../qmmp)
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../qmmpui)
diff --git a/src/ui/aboutdialog.cpp b/src/ui/aboutdialog.cpp
index 849197f9b..8b797ea75 100644
--- a/src/ui/aboutdialog.cpp
+++ b/src/ui/aboutdialog.cpp
@@ -22,14 +22,14 @@
 #include <QFile>
 #include <QTextStream>
 
-#include <decoder.h>
-#include <decoderfactory.h>
-#include <output.h>
-#include <outputfactory.h>
-#include <visual.h>
-#include <visualfactory.h>
-#include <effect.h>
-#include <effectfactory.h>
+#include <qmmp/decoder.h>
+#include <qmmp/decoderfactory.h>
+#include <qmmp/output.h>
+#include <qmmp/outputfactory.h>
+#include <qmmp/visual.h>
+#include <qmmp/visualfactory.h>
+#include <qmmp/effect.h>
+#include <qmmp/effectfactory.h>
 #include <qmmpui/general.h>
 #include <qmmpui/generalfactory.h>
 #include "version.h"
@@ -127,6 +127,3 @@ QString AboutDialog::loadAbout()
 
     return text;
 }
-
-
-
diff --git a/src/ui/commandlineoption.cpp b/src/ui/commandlineoption.cpp
index ca9e8d398..4ed14e456 100644
--- a/src/ui/commandlineoption.cpp
+++ b/src/ui/commandlineoption.cpp
@@ -23,7 +23,7 @@
 
 #include "commandlineoption.h"
 #include "mainwindow.h"
-#include <soundcore.h>
+#include <qmmp/soundcore.h>
 
 
 // Command option manager methods
diff --git a/src/ui/configdialog.cpp b/src/ui/configdialog.cpp
index 0002c859d..820e69ada 100644
--- a/src/ui/configdialog.cpp
+++ b/src/ui/configdialog.cpp
@@ -26,13 +26,13 @@
 #include <QRadioButton>
 #include <QMenu>
 
-#include <decoder.h>
-#include <output.h>
-#include <decoderfactory.h>
-#include <outputfactory.h>
-#include <visualfactory.h>
-#include <effectfactory.h>
-#include <effect.h>
+#include <qmmp/decoder.h>
+#include <qmmp/output.h>
+#include <qmmp/decoderfactory.h>
+#include <qmmp/outputfactory.h>
+#include <qmmp/visualfactory.h>
+#include <qmmp/effectfactory.h>
+#include <qmmp/effect.h>
 #include <qmmpui/generalfactory.h>
 #include <qmmpui/general.h>
 
diff --git a/src/ui/display.cpp b/src/ui/display.cpp
index e4916f00a..7c7b7e961 100644
--- a/src/ui/display.cpp
+++ b/src/ui/display.cpp
@@ -24,7 +24,7 @@
 #include <QSettings>
 #include <QMenu>
 
-#include <output.h>
+#include <qmmp/output.h>
 #include "skin.h"
 #include "mainvisual.h"
 #include "button.h"
diff --git a/src/ui/eqwidget.h b/src/ui/eqwidget.h
index 94cd564d5..03719cb52 100644
--- a/src/ui/eqwidget.h
+++ b/src/ui/eqwidget.h
@@ -21,7 +21,7 @@
 #define EQWIDGET_H
 
 #include <pixmapwidget.h>
-#include <output.h>
+#include <qmmp/output.h>
 
 /**
    @author Ilya Kotov <forkotov02@hotmail.ru>
diff --git a/src/ui/fileloader.cpp b/src/ui/fileloader.cpp
index fda8efdc1..89926f883 100644
--- a/src/ui/fileloader.cpp
+++ b/src/ui/fileloader.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#include <decoder.h>
+#include <qmmp/decoder.h>
 
 #include "fileloader.h"
 #include "mediafile.h"
diff --git a/src/ui/mainvisual.cpp b/src/ui/mainvisual.cpp
index 5bdcbf5cb..dbdd66dcb 100644
--- a/src/ui/mainvisual.cpp
+++ b/src/ui/mainvisual.cpp
@@ -23,9 +23,9 @@
 #include <QMenu>
 #include <QActionGroup>
 
-#include <buffer.h>
-#include <constants.h>
-#include <output.h>
+#include <qmmp/buffer.h>
+#include <qmmp/constants.h>
+#include <qmmp/output.h>
 #include <math.h>
 #include <stdlib.h>
 
diff --git a/src/ui/mainvisual.h b/src/ui/mainvisual.h
index 5c5b76256..8258e38c7 100644
--- a/src/ui/mainvisual.h
+++ b/src/ui/mainvisual.h
@@ -22,8 +22,8 @@
 
 #include <QWidget>
 #include <QResizeEvent>
-#include <visual.h>
-#include <constants.h>
+#include <qmmp/visual.h>
+#include <qmmp/constants.h>
 
 #include "logscale.h"
 
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index d81dbce3b..b6ec78534 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -25,13 +25,12 @@
 
 #include <math.h>
 
-#include <soundcore.h>
+#include <qmmp/soundcore.h>
 #include <qmmpui/generalhandler.h>
 #include <qmmpui/general.h>
 
 #include "textscroller.h"
 #include "mainwindow.h"
-#include "constants.h"
 #include "fileloader.h"
 #include "skin.h"
 #include "playlist.h"
@@ -43,7 +42,7 @@
 #include  "playlistformat.h"
 #include "jumptotrackdialog.h"
 #include "aboutdialog.h"
-#include <addurldialog.h>
+#include "addurldialog.h"
 #include "filedialog.h"
 #include "listwidget.h"
 #include "visualmenu.h"
diff --git a/src/ui/mainwindow.h b/src/ui/mainwindow.h
index 25b2b3b75..0a1b6b60d 100644
--- a/src/ui/mainwindow.h
+++ b/src/ui/mainwindow.h
@@ -22,12 +22,12 @@
 
 #include <QMainWindow>
 
+#include <qmmp/output.h>
+#include <qmmp/decoder.h>
+#include <qmmp/decoderfactory.h>
 
-#include "output.h"
-#include "decoder.h"
 #include "display.h"
 #include "mediafile.h"
-#include "decoderfactory.h"
 #include "titlebar.h"
 
 /**
diff --git a/src/ui/mediafile.cpp b/src/ui/mediafile.cpp
index 6ffb5514f..ffb8bd757 100644
--- a/src/ui/mediafile.cpp
+++ b/src/ui/mediafile.cpp
@@ -20,7 +20,7 @@
 #include <QSettings>
 #include <QDir>
 
-#include <decoder.h>
+#include <qmmp/decoder.h>
 
 #include "mediafile.h"
 
diff --git a/src/ui/playlist.cpp b/src/ui/playlist.cpp
index 282463ef0..8f406ccfb 100644
--- a/src/ui/playlist.cpp
+++ b/src/ui/playlist.cpp
@@ -39,7 +39,7 @@
 #include "symboldisplay.h"
 #include "playlistcontrol.h"
 #include "keyboardmanager.h"
-#include <output.h>
+#include <qmmp/output.h>
 
 PlayList::PlayList ( QWidget *parent )
         : QWidget ( parent )
diff --git a/src/ui/playlistmodel.cpp b/src/ui/playlistmodel.cpp
index 196608438..062483425 100644
--- a/src/ui/playlistmodel.cpp
+++ b/src/ui/playlistmodel.cpp
@@ -30,8 +30,8 @@
 
 #include <time.h>
 
-#include <decoder.h>
-#include <decoderfactory.h>
+#include <qmmp/decoder.h>
+#include <qmmp/decoderfactory.h>
 
 #include "fileloader.h"
 #include "playlistmodel.h"
diff --git a/src/ui/pluginitem.cpp b/src/ui/pluginitem.cpp
index a8666a7c8..4e0b1fd3d 100644
--- a/src/ui/pluginitem.cpp
+++ b/src/ui/pluginitem.cpp
@@ -21,12 +21,12 @@
 #include <QSettings>
 #include <QDir>
 
-#include <decoderfactory.h>
-#include <outputfactory.h>
-#include <visualfactory.h>
-#include <effectfactory.h>
-#include <effect.h>
-#include <soundcore.h>
+#include <qmmp/decoderfactory.h>
+#include <qmmp/outputfactory.h>
+#include <qmmp/visualfactory.h>
+#include <qmmp/effectfactory.h>
+#include <qmmp/effect.h>
+#include <qmmp/soundcore.h>
 #include <qmmpui/generalfactory.h>
 #include <qmmpui/general.h>
 
diff --git a/src/ui/shadedvisual.h b/src/ui/shadedvisual.h
index e46331ecb..0c1d6a37e 100644
--- a/src/ui/shadedvisual.h
+++ b/src/ui/shadedvisual.h
@@ -22,8 +22,8 @@
 
 
 #include <QPainter>
-#include <visual.h>
-#include <buffer.h>
+#include <qmmp/visual.h>
+#include <qmmp/buffer.h>
 
 class QTimer;
 class QPixmap;
diff --git a/src/ui/titlebar.cpp b/src/ui/titlebar.cpp
index bdbd86b2e..164cf7a60 100644
--- a/src/ui/titlebar.cpp
+++ b/src/ui/titlebar.cpp
@@ -24,7 +24,7 @@
 #include <QMenu>
 #include <QSettings>
 
-#include <soundcore.h>
+#include <qmmp/soundcore.h>
 #include "symboldisplay.h"
 #include "skin.h"
 #include "button.h"
diff --git a/src/ui/ui.pro b/src/ui/ui.pro
index bd67c5993..a9f666cdc 100644
--- a/src/ui/ui.pro
+++ b/src/ui/ui.pro
@@ -1,10 +1,15 @@
+# ???? ?????? ? KDevelop ?????????? qmake.
+# ------------------------------------------- 
+# ?????????? ???????????? ???????? ???????? ???????: ./src
+# ???? - ??????????:  ../bin/mp3player
+
 include(../../qmmp.pri)
 
 FORMS += ./forms/configdialog.ui \
          ./forms/preseteditor.ui \
          ./forms/jumptotrackdialog.ui \
          ./forms/aboutdialog.ui \
-	 ./forms/addurldialog.ui
+         ./forms/addurldialog.ui
 
 HEADERS += mainwindow.h \
            fileloader.h \
@@ -106,12 +111,18 @@ SOURCES += mainwindow.cpp \
            filedialog.cpp \
            unixdomainsocket.cpp \
            commandlineoption.cpp \
-	   addurldialog.cpp \
-	   skinreader.cpp \
-	   visualmenu.cpp \
-	   titlebarcontrol.cpp \
-	   shadedvisual.cpp \
-	   shadedbar.cpp
+           addurldialog.cpp \
+           skinreader.cpp \
+           visualmenu.cpp \
+           titlebarcontrol.cpp \
+           shadedvisual.cpp \
+           shadedbar.cpp
+
+#Some conf to redirect intermediate stuff in separate dirs
+UI_DIR=./.build/ui/
+MOC_DIR=./.build/moc/
+OBJECTS_DIR=./.build/obj
+
 
 QT += network xml
 TARGET = ../../bin/qmmp
@@ -120,7 +131,7 @@ warn_on
 QMAKE_LIBDIR += ../../lib qmmpui
 LIBS += -Wl,-rpath,../lib
 LIBS += -L../../lib -lqmmp -lqmmpui
-INCLUDEPATH += ../qmmp ../
+INCLUDEPATH += ../
 RESOURCES = images/images.qrc \
             stuff.qrc
 TEMPLATE = app
diff --git a/src/ui/visualmenu.cpp b/src/ui/visualmenu.cpp
index f41f5bbec..c0e0b2d2f 100644
--- a/src/ui/visualmenu.cpp
+++ b/src/ui/visualmenu.cpp
@@ -20,8 +20,8 @@
 
 #include <QAction>
 
-#include <visual.h>
-#include <visualfactory.h>
+#include <qmmp/visual.h>
+#include <qmmp/visualfactory.h>
 
 #include "pluginitem.h"
 #include "visualmenu.h"