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

List:       kde-commits
Subject:    extragear/multimedia/amarok
From:       Sven Krohlas <sven () asbest-online ! de>
Date:       2009-07-10 15:19:16
Message-ID: 1247239156.052013.18157.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 994442 by krohlas:

Heading towards C++ based unit tests: removing scripted approach.

 M  +1 -1      CMakeLists.txt  
 M  +0 -6      src/amarok_export.h  
 M  +0 -8      src/playlist/PlaylistActions.h  
 M  +0 -3      src/playlistmanager/PlaylistManager.h  
 M  +0 -6      utilities/CMakeLists.txt  
 D             utilities/amaroktest/AmarokTest.cpp  
 D             utilities/amaroktest/AmarokTest.h  
 D             utilities/amaroktest/CMakeLists.txt  
 D             utilities/amaroktest/KUrlExporter.cpp  
 D             utilities/amaroktest/KUrlExporter.h  
 D             utilities/amaroktest/tests/AmarokTest.js  
 D             utilities/amaroktest/tests/CMakeLists.txt  
 D             utilities/amaroktest/tests/PlaylistActions.js  
 D             utilities/amaroktest/tests/PlaylistController.js  
 D             utilities/amaroktest/tests/PlaylistManager.js  


--- trunk/extragear/multimedia/amarok/CMakeLists.txt #994441:994442
@@ -26,7 +26,7 @@
 
 configure_file(config-amarok.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-amarok.h )
 
-# Needed to offer bindings conditionally for amaroktest in debug builds
+# Needed to conditionally build tests and gui
 if(CMAKE_BUILD_TYPE MATCHES debugfull)
    add_definitions(-DDEBUG)
 endif(CMAKE_BUILD_TYPE MATCHES debugfull)
--- trunk/extragear/multimedia/amarok/src/amarok_export.h #994441:994442
@@ -36,9 +36,3 @@
 
 #endif
 
-/** Exports for amaroktest... doesn't work, as the moc preprocessor doesn't understand #define yet... */
-#if defined(DEBUG)
-# define DEBUG_EXPORT Q_INVOKABLE
-#else
-# define DEBUG_EXPORT /** nothing */
-#endif
--- trunk/extragear/multimedia/amarok/src/playlist/PlaylistActions.h #994441:994442
@@ -53,11 +53,7 @@
     {
         Q_OBJECT
 
-#if defined(DEBUG)
-        public slots:
-#else
         public:
-#endif
 
             static Actions* instance();
             static void destroy();
@@ -99,11 +95,7 @@
             // This shouldn't be in Actions, it doesn't make sense
             int queuePosition( quint64 id );
 
-#if defined(DEBUG)
-        /** nothing */
-#else
         public slots:
-#endif
             void play();
             void play( const int row );
             void play( const QModelIndex& index );
--- trunk/extragear/multimedia/amarok/src/playlistmanager/PlaylistManager.h #994441:994442
@@ -69,9 +69,6 @@
         NotPlaylist = Unknown
     };
 
-    #if defined(DEBUG)
-        public slots:
-    #endif
         static PlaylistManager *instance();
         static void destroy();
         //TODO: a facility to allow plugins and scripts to add PlaylistCategory types dynamically.
--- trunk/extragear/multimedia/amarok/utilities/CMakeLists.txt #994441:994442
@@ -1,8 +1,2 @@
-if(CMAKE_BUILD_TYPE MATCHES debugfull)
-    if( WITH_PLAYER )
-        add_subdirectory( amaroktest )
-    endif( WITH_PLAYER )
-endif(CMAKE_BUILD_TYPE MATCHES debugfull)
-
 add_subdirectory( collectionscanner )
 add_subdirectory( afttagger )
[prev in list] [next in list] [prev in thread] [next in thread]