1 files changed, 12 insertions, 12 deletions

diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index 2487993a..70275b6e 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -201,7 +201,7 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name )
     // part's instance! (Simon)
 
     TQString doc;
-    TQStringList allFiles = KGlobal::dirs()->findAllResources( "data", "koffice/koffice_shell.rc" );
+    TQStringList allFiles = TDEGlobal::dirs()->findAllResources( "data", "koffice/koffice_shell.rc" );
     setXMLFile( findMostRecentXMLFile( allFiles, doc ) );
     setLocalXMLFile( locateLocal( "data", "koffice/koffice_shell.rc" ) );
 
@@ -284,7 +284,7 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name )
     d->m_splitViewActionList.append(new KActionSeparator(TQT_TQOBJECT(this)));
 
     // Load list of recent files
-    KConfig * config = instance ? instance->config() : KGlobal::config();
+    KConfig * config = instance ? instance->config() : TDEGlobal::config();
     m_recent->loadEntries( config );
 
     createShellGUI();
@@ -293,7 +293,7 @@ KoMainWindow::KoMainWindow( TDEInstance *instance, const char* name )
     if ( !initialGeometrySet() )
     {
         // Default size
-        const int deskWidth = KGlobalSettings::desktopGeometry(this).width();
+        const int deskWidth = TDEGlobalSettings::desktopGeometry(this).width();
         if (deskWidth > 1100) // very big desktop ?
             resize( 1000, 800 );
         if (deskWidth > 850) // big desktop ?
@@ -443,7 +443,7 @@ void KoMainWindow::addRecentURL( const KURL& url )
         if ( url.isLocalFile() )
         {
             TQString path = url.path( -1 );
-            TQStringList tmpDirs = KGlobal::dirs()->resourceDirs( "tmp" );
+            TQStringList tmpDirs = TDEGlobal::dirs()->resourceDirs( "tmp" );
             for ( TQStringList::Iterator it = tmpDirs.begin() ; ok && it != tmpDirs.end() ; ++it )
                 if ( path.contains( *it ) )
                     ok = false; // it's in the tmp resource
@@ -462,7 +462,7 @@ void KoMainWindow::addRecentURL( const KURL& url )
 void KoMainWindow::saveRecentFiles()
 {
     // Save list of recent files
-    KConfig * config = instance() ? instance()->config() : KGlobal::config();
+    KConfig * config = instance() ? instance()->config() : TDEGlobal::config();
     kdDebug(30003) << this << " Saving recent files list into config. instance()=" << instance() << endl;
     m_recent->saveEntries( config );
     config->sync();
@@ -478,7 +478,7 @@ void KoMainWindow::saveRecentFiles()
 
 void KoMainWindow::reloadRecentFileList()
 {
-    KConfig * config = instance() ? instance()->config() : KGlobal::config();
+    KConfig * config = instance() ? instance()->config() : TDEGlobal::config();
     m_recent->loadEntries( config );
 }
 
@@ -998,8 +998,8 @@ void KoMainWindow::saveWindowSettings()
         d->m_windowSizeDirty = false;
         // Save toolbar position into the config file of the app, under the doc's instance name
         //kdDebug(30003) << "KoMainWindow::closeEvent -> saveMainWindowSettings rootdoc's instance=" << rootDocument()->instance()->instanceName() << endl;
-        saveMainWindowSettings( KGlobal::config(), rootDocument()->instance()->instanceName() );
-        KGlobal::config()->sync();
+        saveMainWindowSettings( TDEGlobal::config(), rootDocument()->instance()->instanceName() );
+        TDEGlobal::config()->sync();
         resetAutoSaveSettings(); // Don't let KMainWindow override the good stuff we wrote down
     }
 }
@@ -1212,7 +1212,7 @@ void KoMainWindow::print(bool quick) {
     if ( title.isEmpty() ) {
         // #139905 - breaks message freeze though
         //const TQString programName = instance()->aboutData() ? instance()->aboutData()->programName() : instance()->instanceName();
-        //title = i18n("%1 unsaved document (%2)").arg(programName).arg(KGlobal::locale()->formatDate(TQDate::currentDate(), true/*short*/));
+        //title = i18n("%1 unsaved document (%2)").arg(programName).arg(TDEGlobal::locale()->formatDate(TQDate::currentDate(), true/*short*/));
     }
     printer.setDocName( title );
     printer.setDocFileName( fileName );
@@ -1275,7 +1275,7 @@ void KoMainWindow::slotConfigureKeys()
 void KoMainWindow::slotConfigureToolbars()
 {
     if (rootDocument())
-        saveMainWindowSettings( KGlobal::config(), rootDocument()->instance()->instanceName() );
+        saveMainWindowSettings( TDEGlobal::config(), rootDocument()->instance()->instanceName() );
     KEditToolbar edit(factory(), this);
     connect(&edit,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig()));
     (void) edit.exec();
@@ -1284,7 +1284,7 @@ void KoMainWindow::slotConfigureToolbars()
 void KoMainWindow::slotNewToolbarConfig()
 {
   if (rootDocument())
-      applyMainWindowSettings( KGlobal::config(), rootDocument()->instance()->instanceName() );
+      applyMainWindowSettings( TDEGlobal::config(), rootDocument()->instance()->instanceName() );
   KXMLGUIFactory *factory = guiFactory();
 
   // Check if there's an active view
@@ -1315,7 +1315,7 @@ void KoMainWindow::slotToolbarToggled( bool toggle )
       bar->hide();
 
     if (rootDocument())
-        saveMainWindowSettings( KGlobal::config(), rootDocument()->instance()->instanceName() );
+        saveMainWindowSettings( TDEGlobal::config(), rootDocument()->instance()->instanceName() );
   }
   else
     kdWarning(30003) << "slotToolbarToggled : Toolbar " << TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name() << " not found!" << endl;