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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/applets/kickoff
From:       Dirk Mueller <mueller () kde ! org>
Date:       2007-10-22 8:17:28
Message-ID: 1193041048.905947.7015.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 728031 by mueller:

remove apps dependency


 M  +0 -2      CMakeLists.txt  
 M  +7 -4      ui/contextmenufactory.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/kickoff/CMakeLists.txt #728030:728031
@@ -1,5 +1,3 @@
-include_directories( ${CMAKE_SOURCE_DIR}/apps/lib/konq )
-
 # Kickoff Shared
 set( Kickoff_SRCS
        core/applicationmodel.cpp
--- trunk/KDE/kdebase/workspace/plasma/applets/kickoff/ui/contextmenufactory.cpp \
#728030:728031 @@ -29,12 +29,11 @@
 // KDE
 #include <KIcon>
 #include <KLocalizedString>
-#include <KMimeType>
+#include <kactioncollection.h>
+#include <kfileitem.h>
+#include <kparts/browserextension.h>
 #include <kbookmarkmanager.h>
 
-// Konqueror
-#include <konq_popupmenu.h>
-
 // Local
 #include "core/favoritesmodel.h"
 #include "core/models.h"
@@ -56,6 +55,9 @@
            browserFlags |= KParts::BrowserExtension::ShowProperties;
        }
        KParts::BrowserExtension::ActionGroupMap actionGroupMap;
+       return 0;
+       // ### TODO: remove kdebase-apps dependency
+#if 0
        KonqPopupMenu *menu = new KonqPopupMenu(items, kUrl,actionCollection,
                                                0, 0, browserFlags,
                                                0, \
KBookmarkManager::userBookmarksManager(), actionGroupMap); @@ -69,6 +71,7 @@
             delete menu;
             return 0;
        }
+#endif
     }
 
     QMap<QAbstractItemView*,QList<QAction*> > viewActions;


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