[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdemultimedia/noatun
From:       Laurent Montel <montel () kde ! org>
Date:       2007-01-06 18:36:45
Message-ID: 1168108605.547371.1686.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 620609 by mlaurent:

Fix other compile pb


 M  +1 -4      CMakeLists.txt  
 M  +1 -1      app/CMakeLists.txt  
 M  +1 -1      app/generalprefs.cpp  
 M  +1 -1      app/pluginmodule.cpp  
 M  +2 -2      library/noatun/config.h  
 M  +2 -2      library/noatun/frontend.h  
 M  +2 -1      library/noatun/plugin.h  
 M  +2 -2      library/noatun/pluginloader.h  


--- trunk/KDE/kdemultimedia/noatun/CMakeLists.txt #620608:620609
@@ -1,12 +1,9 @@
-
+include_directories( ${CMAKE_SOURCE_DIR}/noatun/library  )
 add_subdirectory( pics ) 
 add_subdirectory( library ) 
 add_subdirectory( app ) 
 add_subdirectory( modules ) 
 
-include_directories( ${CMAKE_SOURCE_DIR}/noatun/library  )
-
-
 ########### install files ###############
 
 install( FILES noatun.desktop  DESTINATION  ${XDG_APPS_DIR} )
--- trunk/KDE/kdemultimedia/noatun/app/CMakeLists.txt #620608:620609
@@ -9,7 +9,7 @@
 
 kde4_automoc(${noatun_bin_KDEINIT_SRCS})
 
-kde4_add_ui3_files(noatun_bin_KDEINIT_SRCS generalprefswidget.ui pluginmodulewidget.ui )
+kde4_add_ui_files(noatun_bin_KDEINIT_SRCS generalprefswidget.ui pluginmodulewidget.ui )
 
 kde4_add_kdeinit_executable( noatun_bin ${noatun_bin_KDEINIT_SRCS})
 
--- trunk/KDE/kdemultimedia/noatun/app/generalprefs.cpp #620608:620609
@@ -1,7 +1,7 @@
 /*
 */
 #include "generalprefs.h"
-#include "generalprefswidget.h"
+#include "ui_generalprefswidget.h"
 
 #include <noatun/global.h>
 #include <noatun/pluginloader.h>
--- trunk/KDE/kdemultimedia/noatun/app/pluginmodule.cpp #620608:620609
@@ -19,7 +19,7 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "pluginmodule.h"
-#include "pluginmodulewidget.h"
+#include "ui_pluginmodulewidget.h"
 
 #include <noatun/global.h>
 #include <noatun/plugin.h>
--- trunk/KDE/kdemultimedia/noatun/library/noatun/config.h #620608:620609
@@ -21,11 +21,11 @@
 
 #include <qstring.h>
 //#include <kconfigskeleton.h>
-
+#include <noatun_export.h>
 namespace Noatun
 {
 
-class Config
+class NOATUN_EXPORT Config
 {
 public:
 	Config();
--- trunk/KDE/kdemultimedia/noatun/library/noatun/frontend.h #620608:620609
@@ -2,8 +2,8 @@
 #define N_FRONTEND_H
 
 #include <kmainwindow.h>
+#include <noatun_export.h>
 
-
 namespace Noatun
 {
 
@@ -14,7 +14,7 @@
 /**
  * gives access to noatun-mainwindow
  **/
-class Frontend : public QObject
+class NOATUN_EXPORT Frontend : public QObject
 {
 Q_OBJECT
 public:
--- trunk/KDE/kdemultimedia/noatun/library/noatun/plugin.h #620608:620609
@@ -5,6 +5,7 @@
 #include <kgenericfactory.h>
 #include <kxmlguiclient.h>
 #include <noatun/plugininterfaces.h>
+#include <noatun_export.h>
 
 class KPluginInfo;
 
@@ -16,7 +17,7 @@
 /**
  * @short Base class for all plugins
  **/
-class Plugin : public QObject, public KXMLGUIClient
+class NOATUN_EXPORT Plugin : public QObject, public KXMLGUIClient
 {
 Q_OBJECT
 public:
--- trunk/KDE/kdemultimedia/noatun/library/noatun/pluginloader.h #620608:620609
@@ -4,7 +4,7 @@
 #include <qstring.h>
 #include <qstringlist.h>
 #include <qobject.h>
-
+#include <noatun_export.h>
 #include <kplugininfo.h>
 
 namespace Noatun
@@ -18,7 +18,7 @@
 /**
  * Used for loading plugins at runtime
  **/
-class PluginHandler : public QObject
+class NOATUN_EXPORT PluginHandler : public QObject
 {
 	Q_OBJECT
 public:
[prev in list] [next in list] [prev in thread] [next in thread]