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

List:       kde-commits
Subject:    koffice/kpresenter
From:       Ariya Hidayat <ariya () kde ! org>
Date:       2007-01-03 0:22:02
Message-ID: 1167783722.295834.28839.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 619221 by ariya:

compile


 M  +14 -2     KPrFactory.cpp  
 M  +4 -0      KPrFactory.h  
 M  +1 -1      KPrView.cpp  
 M  +13 -2     part/KPrFactory.cpp  
 M  +5 -1      part/KPrFactory.h  


--- trunk/koffice/kpresenter/KPrFactory.cpp #619220:619221
@@ -22,12 +22,14 @@
 #include "KPrDocument.h"
 #include "KPrAboutData.h"
 
+#include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <kinstance.h>
 
 
 KInstance* KPrFactory::s_global = 0;
 KAboutData* KPrFactory::s_aboutData = 0;
+KIconLoader* KPrFactory::s_iconLoader = 0;
 
 KPrFactory::KPrFactory( QObject* parent, const char* name )
     : KoFactory( parent, name )
@@ -63,6 +65,18 @@
     return s_aboutData;
 }
 
+KIconLoader* KPrFactory::iconLoader()
+{
+    if( !s_iconLoader )
+    {
+        s_iconLoader = new KIconLoader( global()->instanceName() );
+        // Tell the iconloader about share/apps/koffice/icons
+        s_iconLoader->addAppDir("koffice");
+    }
+    
+    return s_iconLoader;
+}
+
 KInstance* KPrFactory::global()
 {
     if ( !s_global )
@@ -75,8 +89,6 @@
                                           KStandardDirs::kde_default("data") + \
"kpresenter/autoforms/");  s_global->dirs()->addResourceType("slideshow",
                                           KStandardDirs::kde_default("data") + \
                "kpresenter/slideshow/");
-        // Tell the iconloader about share/apps/koffice/icons
-        s_global->iconLoader()->addAppDir("koffice");
     }
     return s_global;
 }
--- trunk/koffice/kpresenter/KPrFactory.h #619220:619221
@@ -24,6 +24,7 @@
 #include <KoFactory.h>
 #include <koffice_export.h>
 class KAboutData;
+class KIconLoader;
 
 class KPRESENTER_EXPORT KPrFactory : public KoFactory
 {
@@ -39,10 +40,13 @@
 
     // _Creates_ a KAboutData but doesn't keep ownership
     static KAboutData* aboutData();
+    
+    static KIconLoader* iconLoader();
 
 private:
     static KInstance* s_global;
     static KAboutData* s_aboutData;
+    static KIconLoader* s_iconLoader;
 };
 
 #endif
--- trunk/koffice/kpresenter/KPrView.cpp #619220:619221
@@ -6386,7 +6386,7 @@
         return;
 
     if ( b )
-        m_sbModifiedLabel->setPixmap( KGlobal::iconLoader()->loadIcon( \
"action-modified", K3Icon::Small ) ); +        m_sbModifiedLabel->setPixmap( \
kapp->iconLoader()->loadIcon( "action-modified", K3Icon::Small ) );  else
         m_sbModifiedLabel->setText( "   " );
 }
--- trunk/koffice/kpresenter/part/KPrFactory.cpp #619220:619221
@@ -29,6 +29,7 @@
 
 KInstance* KPrFactory::s_instance = 0;
 KAboutData* KPrFactory::s_aboutData = 0;
+KIconLoader* KPrFactory::s_iconLoader = 0;
 
 KPrFactory::KPrFactory( QObject* parent, const char* name )
     : KoFactory( parent, name )
@@ -65,6 +66,18 @@
     return s_aboutData;
 }
 
+KIconLoader* KPrFactory::iconLoader()
+{
+    if( !s_iconLoader )
+    {
+        s_iconLoader = new KIconLoader( instance()->instanceName() );
+        // Tell the iconloader about share/apps/koffice/icons
+        s_iconLoader->addAppDir("koffice");
+    }
+    
+    return s_iconLoader;
+}
+
 KInstance* KPrFactory::instance()
 {
     if ( !s_instance )
@@ -75,8 +88,6 @@
                 KStandardDirs::kde_default("data") + "kpresenter/templates/");
         s_instance->dirs()->addResourceType("slideshow",
                 KStandardDirs::kde_default("data") + "kpresenter/slideshow/");
-        // Tell the iconloader about share/apps/koffice/icons
-        s_instance->iconLoader()->addAppDir("koffice");
     }
     return s_instance;
 }
--- trunk/koffice/kpresenter/part/KPrFactory.h #619220:619221
@@ -24,6 +24,7 @@
 #include <KoFactory.h>
 
 class KAboutData;
+class KIconLoader;
 
 class KPRESENTER_EXPORT KPrFactory : public KoFactory
 {
@@ -39,10 +40,13 @@
 
     // _Creates_ a KAboutData but doesn't keep ownership
     static KAboutData* aboutData();
-
+    
+    static KIconLoader* iconLoader();
+    
 private:
     static KInstance* s_instance;
     static KAboutData* s_aboutData;
+    static KIconLoader* s_iconLoader;
 };
 
 #endif


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