From 45861392823fa3d54414193df17d4e150a314beb Mon Sep 17 00:00:00 2001
From: Albert Astals Cid <tsdgeos@terra.es>
Date: Mon, 29 Jan 2007 20:18:39 +0000
Subject: [PATCH] Adapt to kdelibs changes

svn path=/trunk/playground/graphics/okular/; revision=628342
---
 core/bookmarkmanager.cpp           | 3 +--
 generators/chm/kio-msits/msits.cpp | 4 ++--
 part.cpp                           | 3 +--
 shell/shell.cpp                    | 6 +++---
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/core/bookmarkmanager.cpp b/core/bookmarkmanager.cpp
index 78e070cd2..33d927a6b 100644
--- a/core/bookmarkmanager.cpp
+++ b/core/bookmarkmanager.cpp
@@ -14,7 +14,6 @@
 #include <kbookmarkmenu.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kinstance.h>
 #include <kstandarddirs.h>
 
 // local includes
@@ -73,7 +72,7 @@ BookmarkManager::BookmarkManager( Document * document )
     d->file = KStandardDirs::locateLocal( "data", "okular/bookmarks.xml" );
 
     d->manager = KBookmarkManager::managerForFile( d->file, "okular", false );
-    d->manager->setEditorOptions( KGlobal::instance()->caption(), false );
+    d->manager->setEditorOptions( KGlobal::caption(), false );
     d->manager->setUpdate( true );
 }
 
diff --git a/generators/chm/kio-msits/msits.cpp b/generators/chm/kio-msits/msits.cpp
index 969a7c148..619a8c53c 100644
--- a/generators/chm/kio-msits/msits.cpp
+++ b/generators/chm/kio-msits/msits.cpp
@@ -19,8 +19,8 @@
 #include <sys/stat.h>
 
 #include <kapplication.h>
+#include <kcomponentdata.h>
 #include <kdebug.h>
-#include <kinstance.h>
 #include <kurl.h>
 #include <kmimetype.h>
 
@@ -39,7 +39,7 @@ extern "C"
     {
 		kDebug() << "*** kio_msits Init" << endl;
 
-        KInstance instance( "kio_msits" );
+        KComponentData instance( "kio_msits" );
 
         if ( argc != 4 )
 		{
diff --git a/part.cpp b/part.cpp
index fa2965e3a..ed9a6eb21 100644
--- a/part.cpp
+++ b/part.cpp
@@ -31,7 +31,6 @@
 #include <kaction.h>
 #include <kactioncollection.h>
 #include <kdirwatch.h>
-#include <kinstance.h>
 #include <kprinter.h>
 #include <kstandardaction.h>
 #include <kparts/genericfactory.h>
@@ -99,7 +98,7 @@ m_searchStarted(false), m_cliPresentation(false)
     m_bExtension = new BrowserExtension(this);
 
     // we need an instance
-    setInstance(okularPartFactory::instance());
+    setComponentData(okularPartFactory::componentData());
 
     // build the document
     m_document = new Okular::Document();
diff --git a/shell/shell.cpp b/shell/shell.cpp
index cc859f680..ff5107af0 100644
--- a/shell/shell.cpp
+++ b/shell/shell.cpp
@@ -140,7 +140,7 @@ void Shell::openUrl( const KUrl & url, uint page )
 
 void Shell::readSettings()
 {
-    m_recent->loadEntries( KGlobal::config() );
+    m_recent->loadEntries( KGlobal::config().data() );
     m_recent->setEnabled( true ); // force enabling
     m_recent->setToolTip( i18n("Click to open a file\nClick and hold to open a recent file") );
 
@@ -151,7 +151,7 @@ void Shell::readSettings()
 
 void Shell::writeSettings()
 {
-    m_recent->saveEntries( KGlobal::config() );
+    m_recent->saveEntries( KGlobal::config().data() );
     KGlobal::config()->setDesktopGroup();
     KGlobal::config()->writeEntry( "FullScreen", m_fullScreenAction->isChecked());
     KGlobal::config()->sync();
@@ -298,7 +298,7 @@ Shell::optionsConfigureToolbars()
   void
 Shell::applyNewToolbarConfig()
 {
-  applyMainWindowSettings(KGlobal::config(), "MainWindow");
+  applyMainWindowSettings(KGlobal::config().data(), "MainWindow");
 }
 
 void Shell::slotQuit()