[Uml-devel] KDE/kdesdk

[Laurent Montel]

SVN commit 521512 by mlaurent:

Adapt to new kdelibs api


 M  +2 -2      kbugbuster/gui/preferencesdialog.cpp  
 M  +2 -2      kcachegrind/kcachegrind/callgraphview.cpp  
 M  +2 -2      kcachegrind/kcachegrind/callitem.cpp  
 M  +2 -2      kcachegrind/kcachegrind/instritem.cpp  
 M  +2 -2      kcachegrind/kcachegrind/sourceitem.cpp  
 M  +2 -2      kcachegrind/kcachegrind/toplevel.cpp  
 M  +1 -1      umbrello/umbrello/kplayerslideraction.cpp  
 M  +5 -5      umbrello/umbrello/uml.cpp  
 M  +1 -1      umbrello/umbrello/worktoolbar.cpp  


--- trunk/KDE/kdesdk/kbugbuster/gui/preferencesdialog.cpp #521511:521512
@@ -81,7 +81,7 @@
 void PreferencesDialog::setupServerPage()
 {
   QFrame *topFrame = addPage( i18n("Servers"), 0,
-                                DesktopIcon( "gohome", KIcon::SizeMedium ) );
+                                DesktopIcon( "gohome", K3Icon::SizeMedium ) );
 
   QBoxLayout *layout = new QVBoxLayout( topFrame );
   layout->setSpacing( spacingHint() );
@@ -112,7 +112,7 @@
 void PreferencesDialog::setupAdvancedPage()
 {
   QFrame *topFrame = addPage( i18n("Advanced"), 0,
-                                DesktopIcon( "misc", KIcon::SizeMedium ) );
+                                DesktopIcon( "misc", K3Icon::SizeMedium ) );
 
   QBoxLayout *layout = new QVBoxLayout( topFrame );
   layout->setSpacing( spacingHint() );
--- trunk/KDE/kdesdk/kcachegrind/kcachegrind/callgraphview.cpp #521511:521512
@@ -1149,8 +1149,8 @@
     if (e->call() && (e->call()->isRecursion() || e->call()->inCycle())) {
 	QString icon = "undo";
 	KIconLoader* loader = KApplication::kApplication()->iconLoader();
-	QPixmap p= loader->loadIcon(icon, KIcon::Small, 0,
-				      KIcon::DefaultState, 0, true);
+	QPixmap p= loader->loadIcon(icon, K3Icon::Small, 0,
+				      K3Icon::DefaultState, 0, true);
 	setPixmap(0, p);
     }
 }
--- trunk/KDE/kdesdk/kcachegrind/kcachegrind/callitem.cpp #521511:521512
@@ -147,8 +147,8 @@
 
 	QString icon = "undo";
 	KIconLoader* loader = KApplication::kApplication()->iconLoader();
-	p= loader->loadIcon(icon, KIcon::Small, 0,
-			    KIcon::DefaultState, 0, true);
+	p= loader->loadIcon(icon, K3Icon::Small, 0,
+			    K3Icon::DefaultState, 0, true);
     }
     setPixmap(2, p);
 }
--- trunk/KDE/kdesdk/kcachegrind/kcachegrind/instritem.cpp #521511:521512
@@ -182,8 +182,8 @@
 
     QString icon = "undo";
     KIconLoader* loader = KApplication::kApplication()->iconLoader();
-    p= loader->loadIcon(icon, KIcon::Small, 0,
-                        KIcon::DefaultState, 0, true);
+    p= loader->loadIcon(icon, K3Icon::Small, 0,
+                        K3Icon::DefaultState, 0, true);
     if (p.isNull())
       str = i18n("(cycle)");
 
--- trunk/KDE/kdesdk/kcachegrind/kcachegrind/sourceitem.cpp #521511:521512
@@ -166,8 +166,8 @@
 
     QString icon = "undo";
     KIconLoader* loader = KApplication::kApplication()->iconLoader();
-    p= loader->loadIcon(icon, KIcon::Small, 0,
-                        KIcon::DefaultState, 0, true);
+    p= loader->loadIcon(icon, K3Icon::Small, 0,
+                        K3Icon::DefaultState, 0, true);
     if (p.isNull())
       str = i18n("(cycle)");
 
--- trunk/KDE/kdesdk/kcachegrind/kcachegrind/toplevel.cpp #521511:521512
@@ -1029,7 +1029,7 @@
 #else
   if(KIO::NetAccess::download( url, tmpFile )) {
 #endif
-    _openRecent->addURL(url);
+    _openRecent->addUrl(url);
     _openRecent->saveEntries( KGlobal::config() );
 
     loadTrace(tmpFile);
@@ -1078,7 +1078,7 @@
 #else
   if(KIO::NetAccess::download( url, tmpFile )) {
 #endif
-    _openRecent->addURL(url);
+    _openRecent->addUrl(url);
     _openRecent->saveEntries( KGlobal::config() );
 
     addTrace(tmpFile);
--- trunk/KDE/kdesdk/umbrello/umbrello/kplayerslideraction.cpp #521511:521512
@@ -19,7 +19,7 @@
 
 #include <kapplication.h>
 #include <ktoolbar.h>
-#include <ktoolbarbutton.h>
+
 #include <qtooltip.h>
 #include <q3whatsthis.h>
 //Added by qt3to4:
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.cpp #521511:521512
@@ -43,7 +43,7 @@
 #include <kstatusbar.h>
 #include <ktip.h>
 #include <ktabwidget.h>
-#include <ktoolbarbutton.h>
+
 #include <kmenu.h>
 
 // app includes
@@ -447,7 +447,7 @@
     slotStatusMsg(i18n("Opening file..."));
 
     m_doc->openDocument( url);
-    fileOpenRecent->addURL( url );
+    fileOpenRecent->addUrl( url );
     slotStatusMsg(i18n("Ready."));
     setCaption(m_doc->URL().fileName(), false);
     enablePrint(true);
@@ -658,7 +658,7 @@
                  "*.mdl|Rose model files"), this, i18n("Open File"));
         if(!url.isEmpty()) {
             if(m_doc->openDocument(url))
-                fileOpenRecent->addURL( url );
+                fileOpenRecent->addUrl( url );
             enablePrint(true);
             setCaption(m_doc->URL().fileName(), false);
         }
@@ -680,7 +680,7 @@
         // here saving wasn't successful
     } else {
         if(!m_doc->openDocument(url)) {
-            fileOpenRecent->removeURL(url);
+            fileOpenRecent->removeUrl(url);
             fileOpenRecent->setCurrentItem( -1 );
         }
         enablePrint(true);
@@ -738,7 +738,7 @@
     if(!url.isEmpty()) {
         bool b = m_doc->saveDocument(url);
         if (b) {
-            fileOpenRecent->addURL(url);
+            fileOpenRecent->addUrl(url);
             setCaption(url.fileName(),m_doc->isModified());
             slotStatusMsg(i18n("Ready."));
         }
--- trunk/KDE/kdesdk/umbrello/umbrello/worktoolbar.cpp #521511:521512
@@ -18,8 +18,8 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
-#include <ktoolbarbutton.h>
 
+
 // application specific includes
 #include "uml.h"
 #include "umldoc.h"