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

List:       kde-commits
Subject:    KDE/kdebase/kicker
From:       Matt Broadstone <mbroadst () gmail ! com>
Date:       2005-09-02 21:28:33
Message-ID: 1125696513.745597.6901.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 456438 by mbroadst:

various build oddities

 M  +2 -1      kicker/buttons/bookmarksbutton.cpp  
 M  +2 -1      kicker/ui/k_mnu.cpp  
 M  +4 -2      libkicker/Makefile.am  
 M  +4 -2      libkicker/kpanelmenu.cpp  
 M  +2 -1      menuext/konsole/konsole_mnu.cpp  
 M  +2 -1      menuext/konsole/konsolebookmarkhandler.cpp  


--- trunk/KDE/kdebase/kicker/kicker/buttons/bookmarksbutton.cpp #456437:456438
@@ -41,7 +41,8 @@
       bookmarkOwner(0)
 {
     actionCollection = new KActionCollection( this );
-    bookmarkParent = new KPopupMenu(this, "bookmarks");
+    bookmarkParent = new KPopupMenu(this);
+    bookmarkParent->setObjectName("bookmarks");
     bookmarkOwner = new KBookmarkOwner;
     bookmarkMenu = new KBookmarkMenu(KonqBookmarkManager::self(),
                                      bookmarkOwner,
--- trunk/KDE/kdebase/kicker/kicker/ui/k_mnu.cpp #456437:456438
@@ -215,7 +215,8 @@
     if (KickerSettings::useBookmarks() && kapp->authorizeKAction("bookmarks"))
     {
         // Need to create a new popup each time, it's deleted by subMenus.clear()
-        KPopupMenu * bookmarkParent = new KPopupMenu( this, "bookmarks" );
+        KPopupMenu * bookmarkParent = new KPopupMenu(this);
+	bookmarkParent->setObjectName("bookmarks" );
         if(!bookmarkOwner)
             bookmarkOwner = new KBookmarkOwner;
         delete bookmarkMenu; // can't reuse old one, the popup has been deleted
--- trunk/KDE/kdebase/kicker/libkicker/Makefile.am #456437:456438
@@ -9,7 +9,8 @@
                            kshadowengine.cpp paneldrag.cpp \
                            kpanelapplet.cpp  kpanelappmenu.cpp  \
                            kpanelextension.cpp  kpanelmenu.cpp \
-                           simplebutton.cpp extensionSettings.kcfgc
+                           simplebutton.cpp extensionSettings.kcfgc \
+			   extensioninfo.cpp
 
 libkickermain_la_METASOURCES = AUTO
 
@@ -21,7 +22,8 @@
 noinst_HEADERS = abstractpanelmanager.h appletinfo.h kickertip.h kpanelappmenu.h \
                  kshadowsettings.h panelbutton.h panner.h \
                  kshadowengine.h menuinfo.h paneldrag.h \
-                 abstractpanelmanager.h
+                 extensioninfo.h
+		 
 libkickermain_la_include_HEADERS = kpanelapplet.h \
                                    kpanelextension.h \
                                    kpanelmenu.h \
--- trunk/KDE/kdebase/kicker/libkicker/kpanelmenu.cpp #456437:456438
@@ -41,14 +41,16 @@
 };
 
 KPanelMenu::KPanelMenu(const QString &startDir, QWidget *parent, const char *name)
-  : KPopupMenu(parent, name)
+  : KPopupMenu(parent)
 {
+    setObjectName(name);
     init(startDir);
 }
 
 KPanelMenu::KPanelMenu(QWidget *parent, const char *name)
-  : KPopupMenu(parent, name)
+  : KPopupMenu(parent)
 {
+    setObjectName(name);
     init();
 }
 
--- trunk/KDE/kdebase/kicker/menuext/konsole/konsole_mnu.cpp #456437:456438
@@ -323,8 +323,9 @@
 //*****************************************************************
 
 KonsoleMenuFactory::KonsoleMenuFactory(QObject *parent, const char *name)
-: KLibFactory(parent, name)
+: KLibFactory(parent)
 {
+    setObjectName(name);
     KGlobal::iconLoader()->addAppDir("konsole");
     KGlobal::locale()->insertCatalogue("konsolemenuapplet");
 }
--- trunk/KDE/kdebase/kicker/menuext/konsole/konsolebookmarkhandler.cpp #456437:456438
@@ -23,7 +23,8 @@
       m_konsole( konsole ),
       m_importStream( 0L )
 {
-    m_menu = new KPopupMenu( konsole, "bookmark menu" );
+    m_menu = new KPopupMenu(konsole);
+    m_menu->setObjectName("bookmark menu");
 
     QString file = locate( "data", "kfile/bookmarks.xml" );
     if ( file.isEmpty() )
[prev in list] [next in list] [prev in thread] [next in thread]