[PATCH] - kdebase-3.1.2 and gcc-3.3.1

Greg Schafer gschafer at zip.com.au
Thu Jul 17 22:13:15 PDT 2003


Hi

I've been testing gcc-3.3.1 (to be released RSN). Pretty much everything I
tried that compiles with gcc-3.3 will also compile with 3.3.1, except for
kdebase-3.1.2.

Here's a patch that might hopefully save someone else some pain.

Greg
-------------- next part --------------
Patch Description:
Fix build with gcc-3.3.1

Source of Patch:
Straight from the KDE CVS repo. See KDE bug 60621.

Patch Made by:
Greg Schafer <gschafer at zip.com.au>

===================================================================
RCS file: /home2/webcvs/mirror/kdebase/kicker/ui/service_mnu.cpp,v
retrieving revision 1.50.2.3
retrieving revision 1.50.2.4
diff -u -p -r1.50.2.3 -r1.50.2.4
--- kdebase/kicker/ui/service_mnu.cpp	2003/06/21 22:28:29	1.50.2.3
+++ kdebase/kicker/ui/service_mnu.cpp	2003/07/02 19:54:07	1.50.2.4
@@ -220,7 +220,7 @@ void PanelServiceMenu::doInitialize()
 
     if (addmenumode_) {
         int mid = insertItem(SmallIconSet("ok"), i18n("Add This Menu"), id++);
-        entryMap_.insert(mid, static_cast<KSharedPtr<KSycocaEntry> >(root));
+        entryMap_.insert(mid, static_cast<KSycocaEntry*>(root));
 
         if (list.count() > 0) {
             insertSeparator();
@@ -276,7 +276,7 @@ void PanelServiceMenu::doInitialize()
             iconset.setPixmap(active, QIconSet::Small, QIconSet::Active);
             
             int newId = insertItem(iconset, groupCaption, m, id++);
-            entryMap_.insert(newId, static_cast<KSharedPtr<KSycocaEntry> >(g));
+            entryMap_.insert(newId, static_cast<KSycocaEntry*>(g));
             // We have to delete the sub menu our selves! (See Qt docs.)
             subMenus.append(m);
         }
@@ -357,7 +357,7 @@ void PanelServiceMenu::insertMenuItem(KS
     iconset.setPixmap(active, QIconSet::Small, QIconSet::Active);
 
     int newId = insertItem(iconset, serviceName, nId, nIndex);
-    entryMap_.insert(newId, static_cast<KSharedPtr<KSycocaEntry> >(s));
+    entryMap_.insert(newId, static_cast<KSycocaEntry*>(s));
 }
 
 void PanelServiceMenu::slotExec(int id)


More information about the blfs-support mailing list