Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

14 files changed, 71 insertions, 71 deletions

diff --git a/kooka/img_saver.cpp b/kooka/img_saver.cpp
index 7132339c..229194af 100644
--- a/kooka/img_saver.cpp
+++ b/kooka/img_saver.cpp
@@ -335,7 +335,7 @@ ImgSaveStat ImgSaver::saveImage( TQImage *image )
    kdDebug(28000) << "saveImage: Directory is " << directory << endl;
    TQString filename = createFilename( format );
 
-   KConfig *konf = KGlobal::config ();
+   KConfig *konf = TDEGlobal::config ();
    konf->setGroup( OP_FILE_GROUP );
 
    if( konf->readBoolEntry( OP_ASK_FILENAME, false ) )
@@ -425,7 +425,7 @@ ImgSaveStat ImgSaver::saveImage( TQImage *image, const KURL& filename, const TQS
 TQString ImgSaver::findFormat( picType type )
 {
    TQString format;
-   KConfig *konf = KGlobal::config ();
+   KConfig *konf = TDEGlobal::config ();
    konf->setGroup( OP_FILE_GROUP );
 
    if( type == PT_THUMBNAIL )
@@ -552,7 +552,7 @@ bool ImgSaver::isRememberedFormat( picType type, TQString format ) const
 
 TQString ImgSaver::getFormatForType( picType type ) const
 {
-   KConfig *konf = KGlobal::config ();
+   KConfig *konf = TDEGlobal::config ();
    TQ_CHECK_PTR( konf );
    konf->setGroup( OP_FILE_GROUP );
 
@@ -582,7 +582,7 @@ TQString ImgSaver::getFormatForType( picType type ) const
 
 void ImgSaver::storeFormatForType( picType type, TQString format, bool ask )
 {
-   KConfig *konf = KGlobal::config ();
+   KConfig *konf = TDEGlobal::config ();
    TQ_CHECK_PTR( konf );
    konf->setGroup( OP_FILE_GROUP );
 
@@ -691,7 +691,7 @@ ImgSaveStat ImgSaver::save( TQImage *image, const TQString &filename,
 void ImgSaver::readConfig( void )
 {
 
-   KConfig *konf = KGlobal::config ();
+   KConfig *konf = TDEGlobal::config ();
    TQ_CHECK_PTR( konf );
    konf->setGroup( OP_FILE_GROUP );
    ask_for_format = konf->readBoolEntry( OP_FILE_ASK_FORMAT, true );
diff --git a/kooka/kocrbase.cpp b/kooka/kocrbase.cpp
index 0de5c88c..171d1b4d 100644
--- a/kooka/kocrbase.cpp
+++ b/kooka/kocrbase.cpp
@@ -81,7 +81,7 @@ KOCRBase::KOCRBase( TQWidget *parent, KSpellConfig *spellConfig,
     kdDebug(28000) << "OCR Base Dialog!" << endl;
     // Layout-Boxes
 
-    KConfig *konf = KGlobal::config ();
+    KConfig *konf = TDEGlobal::config ();
     KConfigGroupSaver gs( konf, CFG_OCR_KSPELL );
     m_userWantsSpellCheck = konf->readBoolEntry(CFG_WANT_KSPELL, true);
 
@@ -359,7 +359,7 @@ void KOCRBase::slWantSpellcheck( bool wantIt )
     }
     m_userWantsSpellCheck = wantIt;
 
-    KConfig *konf = KGlobal::config ();
+    KConfig *konf = TDEGlobal::config ();
     KConfigGroupSaver gs( konf, CFG_OCR_KSPELL );
     konf->writeEntry( CFG_WANT_KSPELL, wantIt );
 }
diff --git a/kooka/kocrgocr.cpp b/kooka/kocrgocr.cpp
index 0f879124..fc7e45a7 100644
--- a/kooka/kocrgocr.cpp
+++ b/kooka/kocrgocr.cpp
@@ -93,7 +93,7 @@ EngineError KGOCRDialog::setupGui()
     TQVBox *page = ocrPage();
     TQ_CHECK_PTR( page );
 
-    KConfig *conf = KGlobal::config ();
+    KConfig *conf = TDEGlobal::config ();
     conf->setGroup( CFG_GROUP_OCR_DIA );
 
     //Qt::Horizontal line
@@ -179,7 +179,7 @@ KGOCRDialog::~KGOCRDialog()
 
 void KGOCRDialog::writeConfig( void )
 {
-   KConfig *conf = KGlobal::config ();
+   KConfig *conf = TDEGlobal::config ();
    conf->setGroup( CFG_GROUP_OCR_DIA );
 
    conf->writeEntry( CFG_GOCR_BINARY, TQString(getOCRCmd()));
diff --git a/kooka/kocrkadmos.cpp b/kooka/kocrkadmos.cpp
index 3fed9b2a..58191256 100644
--- a/kooka/kocrkadmos.cpp
+++ b/kooka/kocrkadmos.cpp
@@ -100,7 +100,7 @@ EngineError KadmosDialog::findClassifiers()
 {
     findClassifierPath();
 
-    KLocale *locale = KGlobal::locale();
+    KLocale *locale = TDEGlobal::locale();
     TQStringList allCountries = locale->allLanguagesTwoAlpha ();
     for ( TQStringList::Iterator it = allCountries.begin();
           it != allCountries.end(); ++it )
@@ -236,7 +236,7 @@ EngineError KadmosDialog::findClassifierPath()
     KStandardDirs stdDir;
     EngineError err = ENG_OK;
 
-    KConfig *conf = KGlobal::config ();
+    KConfig *conf = TDEGlobal::config ();
     KConfigGroupSaver gs( conf, CFG_GROUP_KADMOS );
 
     m_customClassifierPath = conf->readPathEntry( CFG_KADMOS_CLASSIFIER_PATH );
@@ -341,7 +341,7 @@ void KadmosDialog::slFontChanged( int id )
 {
     m_cbLang->clear();
 
-    KConfig *conf = KGlobal::config ();
+    KConfig *conf = TDEGlobal::config ();
     KConfigGroupSaver gs( conf, CFG_GROUP_KADMOS );
 
 
diff --git a/kooka/kocrocrad.cpp b/kooka/kocrocrad.cpp
index 00bfb47b..340bc4ad 100644
--- a/kooka/kocrocrad.cpp
+++ b/kooka/kocrocrad.cpp
@@ -104,7 +104,7 @@ EngineError ocradDialog::setupGui()
     TQVBox *page = ocrPage();
     TQ_CHECK_PTR( page );
 
-    KConfig *conf = KGlobal::config ();
+    KConfig *conf = TDEGlobal::config ();
     conf->setGroup( CFG_GROUP_OCR_DIA );
 
     //Qt::Horizontal line
@@ -177,7 +177,7 @@ ocradDialog::~ocradDialog()
 
 void ocradDialog::writeConfig( void )
 {
-   KConfig *conf = KGlobal::config ();
+   KConfig *conf = TDEGlobal::config ();
    conf->setGroup( CFG_GROUP_OCR_DIA );
 
    conf->writeEntry( CFG_OCRAD_BINARY, TQString(getOCRCmd()));
@@ -207,22 +207,22 @@ void ocradDialog::version( const TQString& exe )
 {
     if( m_proc ) delete m_proc;
 
-    m_proc = new KProcess;
+    m_proc = new TDEProcess;
 
     kdDebug(28000) << "Using " << exe << " as command" << endl;
     *m_proc << exe;
     *m_proc << TQString("-V");
 
-    connect( m_proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int )),
-             this,     TQT_SLOT(slReceiveStdIn(KProcess *, char *, int )));
+    connect( m_proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int )),
+             this,     TQT_SLOT(slReceiveStdIn(TDEProcess *, char *, int )));
 
-    if( ! m_proc->start( KProcess::NotifyOnExit, KProcess::Stdout ) )
+    if( ! m_proc->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout ) )
     {
         slReceiveStdIn( 0, (char*) "unknown", 7 );
     }
 }
 
-void ocradDialog::slReceiveStdIn( KProcess*, char *buffer, int buflen)
+void ocradDialog::slReceiveStdIn( TDEProcess*, char *buffer, int buflen)
 {
     TQString vstr = TQString::fromUtf8(buffer, buflen);
 
diff --git a/kooka/kocrocrad.h b/kooka/kocrocrad.h
index 0612b8a3..22b4fa1f 100644
--- a/kooka/kocrocrad.h
+++ b/kooka/kocrocrad.h
@@ -48,7 +48,7 @@
 
 class KSpellConfig;
 class KURLRequester;
-class KProcess;
+class TDEProcess;
 class TQLabel;
 class TQComboBox;
 
@@ -92,7 +92,7 @@ private:
     void version( const TQString& exe );
 
 private slots:
-    void slReceiveStdIn( KProcess *proc, char *buffer, int buflen);
+    void slReceiveStdIn( TDEProcess *proc, char *buffer, int buflen);
 
 private:
 
@@ -100,7 +100,7 @@ private:
     KURLRequester *m_orfUrlRequester;
     TQComboBox      *m_layoutMode;
     TQLabel         *m_binaryLabel;
-    KProcess       *m_proc;
+    TDEProcess       *m_proc;
     int             m_version;
 };
 
diff --git a/kooka/kooka.cpp b/kooka/kooka.cpp
index 4750bf07..8d944913 100644
--- a/kooka/kooka.cpp
+++ b/kooka/kooka.cpp
@@ -75,7 +75,7 @@ Kooka::Kooka( const TQCString& deviceToUse)
     setXMLFile( "kookaui.rc", true );
 
     setAcceptDrops(false); // Waba: Not (yet?) supported
-    KConfig *konf = KGlobal::config ();
+    KConfig *konf = TDEGlobal::config ();
     readDockConfig ( konf, DOCK_SIZES );
 
     // then, setup our actions
@@ -109,7 +109,7 @@ void Kooka::createMyGUI( KParts::Part *part )
 
 Kooka::~Kooka()
 {
-   KConfig *konf = KGlobal::config ();
+   KConfig *konf = TDEGlobal::config ();
    m_view->slCloseScanDevice();
    writeDockConfig ( konf, DOCK_SIZES );
    delete m_printer;
@@ -385,7 +385,7 @@ void Kooka::optionsShowPreviewer()
 void Kooka::optionsConfigureToolbars()
 {
     // use the standard toolbar editor
-    saveMainWindowSettings(KGlobal::config(), autoSaveGroup());
+    saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
     KEditToolbar dlg(factory());
     connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(newToolbarConfig()));
     dlg.exec();
@@ -394,7 +394,7 @@ void Kooka::optionsConfigureToolbars()
 void Kooka::newToolbarConfig()
 {
     // OK/Apply pressed in the toolbar editor
-    applyMainWindowSettings(KGlobal::config(), autoSaveGroup());
+    applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup());
 }
 
 void Kooka::optionsPreferences()
diff --git a/kooka/kookapref.cpp b/kooka/kookapref.cpp
index 6b88fb33..d6bb729b 100644
--- a/kooka/kookapref.cpp
+++ b/kooka/kookapref.cpp
@@ -62,7 +62,7 @@ KookaPreferences::KookaPreferences()
     // this is the base class for your preferences dialog.  it is now
     // a Treelist dialog.. but there are a number of other
     // possibilities (including Tab, Swallow, and just Plain)
-    konf = KGlobal::config ();
+    konf = TDEGlobal::config ();
 
     setupStartupPage();
     setupSaveFormatPage();
@@ -200,7 +200,7 @@ TQString KookaPreferences::tryFindBinary( const TQString& bin, const TQString& c
 {
 
     /* First check the config files for an entry */
-    KConfig *cfg = KGlobal::config();
+    KConfig *cfg = TDEGlobal::config();
     cfg->setGroup(CFG_GROUP_OCR_DIA);
     TQString res = cfg->readPathEntry( configKey /* CFG_GOCR_BINARY */, "notFound" );
 
diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp
index 85a29d60..45f101f9 100644
--- a/kooka/kookaview.cpp
+++ b/kooka/kookaview.cpp
@@ -96,7 +96,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU
      m_mainWindow(parent),
      m_ocrResEdit(0)
 {
-   KIconLoader *loader = KGlobal::iconLoader();
+   KIconLoader *loader = TDEGlobal::iconLoader();
    scan_params = 0L;
    preview_canvas = 0L;
 
@@ -294,7 +294,7 @@ KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToU
 
 KookaView::~KookaView()
 {
-   saveProperties( KGlobal::config () );
+   saveProperties( TDEGlobal::config () );
    delete preview_canvas;
 
    kdDebug(28000)<< "Finished saving config data" << endl;
@@ -438,7 +438,7 @@ void KookaView::loadStartupImage( void )
    kdDebug( 28000) << "Starting to load startup image" << endl;
 
    /* Now set the configured stuff */
-   KConfig *konf = KGlobal::config ();
+   KConfig *konf = TDEGlobal::config ();
    if( konf )
    {
       konf->setGroup(GROUP_STARTUP);
@@ -555,7 +555,7 @@ void KookaView::startOCR( KookaImage *img )
    {
       if( ocrFabric == 0L )
       {
-          ocrFabric = new KSANEOCR( m_mainDock, KGlobal::config() );
+          ocrFabric = new KSANEOCR( m_mainDock, TDEGlobal::config() );
           ocrFabric->setImageCanvas( img_canvas );
 
           connect( ocrFabric, TQT_SIGNAL( newOCRResultText( const TQString& )),
diff --git a/kooka/ksaneocr.cpp b/kooka/ksaneocr.cpp
index f22d83fd..bbaa15a8 100644
--- a/kooka/ksaneocr.cpp
+++ b/kooka/ksaneocr.cpp
@@ -85,7 +85,7 @@ KSANEOCR::KSANEOCR( TQWidget*, KConfig *cfg ):
     m_applyFilter(false),
     m_unlinkORF(true)
 {
-    KConfig *konf = KGlobal::config ();
+    KConfig *konf = TDEGlobal::config ();
     m_ocrEngine = OCRAD;
     m_img = 0L;
     m_tmpFile = 0L;
@@ -393,7 +393,7 @@ void KSANEOCR::startOCRAD( )
 	daemon = 0;
     }
 
-    daemon = new KProcess;
+    daemon = new TDEProcess;
     TQ_CHECK_PTR(daemon);
 
     *daemon << cmd;
@@ -403,7 +403,7 @@ void KSANEOCR::startOCRAD( )
     *daemon << TQString("-l");
     *daemon << TQString::number( ocrDia->layoutDetectionMode());
 
-    KConfig *konf = KGlobal::config ();
+    KConfig *konf = TDEGlobal::config ();
     KConfigGroupSaver( konf, CFG_GROUP_OCRAD );
 
     TQString format = konf->readEntry( CFG_OCRAD_FORMAT, "utf8");
@@ -425,14 +425,14 @@ void KSANEOCR::startOCRAD( )
 
     m_ocrResultText = "";
 
-    connect(daemon, TQT_SIGNAL(processExited(KProcess *)),
-	    this,   TQT_SLOT(  ocradExited(KProcess*)));
-    connect(daemon, TQT_SIGNAL(receivedStdout(KProcess *, char*, int)),
-	    this,   TQT_SLOT(  ocradStdIn(KProcess*, char*, int)));
-    connect(daemon, TQT_SIGNAL(receivedStderr(KProcess *, char*, int)),
-	    this,   TQT_SLOT(  ocradStdErr(KProcess*, char*, int)));
+    connect(daemon, TQT_SIGNAL(processExited(TDEProcess *)),
+	    this,   TQT_SLOT(  ocradExited(TDEProcess*)));
+    connect(daemon, TQT_SIGNAL(receivedStdout(TDEProcess *, char*, int)),
+	    this,   TQT_SLOT(  ocradStdIn(TDEProcess*, char*, int)));
+    connect(daemon, TQT_SIGNAL(receivedStderr(TDEProcess *, char*, int)),
+	    this,   TQT_SLOT(  ocradStdErr(TDEProcess*, char*, int)));
 
-    if (!daemon->start(KProcess::NotifyOnExit, KProcess::All))
+    if (!daemon->start(TDEProcess::NotifyOnExit, TDEProcess::All))
     {
 	kdDebug(28000) <<  "Error starting ocrad-daemon!" << endl;
     }
@@ -445,7 +445,7 @@ void KSANEOCR::startOCRAD( )
 }
 
 
-void KSANEOCR::ocradExited(KProcess* )
+void KSANEOCR::ocradExited(TDEProcess* )
 {
     kdDebug(28000) << "ocrad exit " << endl;
     TQString err;
@@ -462,14 +462,14 @@ void KSANEOCR::ocradExited(KProcess* )
 
 }
 
-void KSANEOCR::ocradStdErr(KProcess*, char* buffer, int buflen)
+void KSANEOCR::ocradStdErr(TDEProcess*, char* buffer, int buflen)
 {
    TQString errorBuffer = TQString::fromLocal8Bit(buffer, buflen);
    kdDebug(28000) << "ocrad says on stderr: " << errorBuffer << endl;
 
 }
 
-void KSANEOCR::ocradStdIn(KProcess*, char* buffer, int buflen)
+void KSANEOCR::ocradStdIn(TDEProcess*, char* buffer, int buflen)
 {
    TQString errorBuffer = TQString::fromLocal8Bit(buffer, buflen);
    kdDebug(28000) << "ocrad says on stdin: " << errorBuffer << endl;
@@ -531,16 +531,16 @@ void KSANEOCR::startOCRProcess( void )
            daemon = 0;
        }
 
-       daemon = new KProcess;
+       daemon = new TDEProcess;
        TQ_CHECK_PTR(daemon);
        m_ocrResultText = "";
 
-       connect(daemon, TQT_SIGNAL(processExited(KProcess *)),
-               this,   TQT_SLOT(  gocrExited(KProcess*)));
-       connect(daemon, TQT_SIGNAL(receivedStdout(KProcess *, char*, int)),
-               this,   TQT_SLOT(  gocrStdIn(KProcess*, char*, int)));
-       connect(daemon, TQT_SIGNAL(receivedStderr(KProcess *, char*, int)),
-               this,   TQT_SLOT(  gocrStdErr(KProcess*, char*, int)));
+       connect(daemon, TQT_SIGNAL(processExited(TDEProcess *)),
+               this,   TQT_SLOT(  gocrExited(TDEProcess*)));
+       connect(daemon, TQT_SIGNAL(receivedStdout(TDEProcess *, char*, int)),
+               this,   TQT_SLOT(  gocrStdIn(TDEProcess*, char*, int)));
+       connect(daemon, TQT_SIGNAL(receivedStderr(TDEProcess *, char*, int)),
+               this,   TQT_SLOT(  gocrStdErr(TDEProcess*, char*, int)));
 
        TQString opt;
        *daemon << TQFile::encodeName(cmd).data();
@@ -570,7 +570,7 @@ void KSANEOCR::startOCRProcess( void )
 
        m_ocrCurrLine = 0;  // Important in gocrStdIn to store the results
 
-       if (!daemon->start(KProcess::NotifyOnExit, KProcess::All))
+       if (!daemon->start(TDEProcess::NotifyOnExit, TDEProcess::All))
        {
            kdDebug(28000) <<  "Error starting daemon!" << endl;
        }
@@ -715,7 +715,7 @@ void KSANEOCR::slotKadmosResult()
 /*
  *
  */
-void KSANEOCR::gocrExited(KProcess* d)
+void KSANEOCR::gocrExited(TDEProcess* d)
 {
    kdDebug(28000) << "daemonExited start !" << endl;
 
@@ -1051,7 +1051,7 @@ void KSANEOCR::cleanUpFiles( void )
 }
 
 
-void KSANEOCR::gocrStdErr(KProcess*, char* buffer, int buflen)
+void KSANEOCR::gocrStdErr(TDEProcess*, char* buffer, int buflen)
 {
    TQString errorBuffer = TQString::fromLocal8Bit(buffer, buflen);
    kdDebug(28000) << "gocr says: " << errorBuffer << endl;
@@ -1059,7 +1059,7 @@ void KSANEOCR::gocrStdErr(KProcess*, char* buffer, int buflen)
 }
 
 
-void KSANEOCR::gocrStdIn(KProcess*, char* buffer, int buflen)
+void KSANEOCR::gocrStdIn(TDEProcess*, char* buffer, int buflen)
 {
     TQString aux = TQString::fromLocal8Bit(buffer, buflen);
 
diff --git a/kooka/ksaneocr.h b/kooka/ksaneocr.h
index 1a94a718..7d312aaf 100644
--- a/kooka/ksaneocr.h
+++ b/kooka/ksaneocr.h
@@ -52,7 +52,7 @@
 class KOCRBase;
 class KookaImage;
 class KTempFile;
-class KProcess;
+class TDEProcess;
 class TQRect;
 class TQPixmap;
 class TQStringList;
@@ -222,13 +222,13 @@ private slots:
 
     void slotKadmosResult();
     void startOCRProcess( void );
-    void gocrStdIn(KProcess*, char* buffer, int buflen);
-    void gocrStdErr(KProcess*, char* buffer, int buflen);
-    void gocrExited(KProcess*);
+    void gocrStdIn(TDEProcess*, char* buffer, int buflen);
+    void gocrStdErr(TDEProcess*, char* buffer, int buflen);
+    void gocrExited(TDEProcess*);
 
-    void ocradStdIn(KProcess*, char* buffer, int buflen);
-    void ocradStdErr(KProcess*, char* buffer, int buflen);
-    void ocradExited(KProcess*);
+    void ocradStdIn(TDEProcess*, char* buffer, int buflen);
+    void ocradStdErr(TDEProcess*, char* buffer, int buflen);
+    void ocradExited(TDEProcess*);
 
     /*
      * reads orf files from a file and fills the result structures
@@ -241,7 +241,7 @@ private:
 
 
     KOCRBase        *m_ocrProcessDia;
-    KProcess        *daemon;
+    TDEProcess        *daemon;
     bool             visibleOCRRunning;
     KTempFile       *m_tmpFile;
 
diff --git a/kooka/main.cpp b/kooka/main.cpp
index 3b8d6ec0..95788ebe 100644
--- a/kooka/main.cpp
+++ b/kooka/main.cpp
@@ -85,9 +85,9 @@ int main( int argc, char *argv[] )
    TDECmdLineArgs::addCmdLineOptions( options ); // Add my own options.
 
    TDEApplication app;
-   KGlobal::locale()->insertCatalogue("libkscan");
+   TDEGlobal::locale()->insertCatalogue("libkscan");
    KImageIO::registerFormats();
-   KIconLoader *loader = KGlobal::iconLoader();
+   KIconLoader *loader = TDEGlobal::iconLoader();
 
    TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
    TQCString  devToUse = args->getOption( "d" );
diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp
index a54fde7c..71b97246 100644
--- a/kooka/scanpackager.cpp
+++ b/kooka/scanpackager.cpp
@@ -117,7 +117,7 @@ ScanPackager::ScanPackager( TQWidget *parent ) : KFileTreeView( parent )
    m_currImportDir = m_currCopyDir;
 
    /* Preload frequently used icons */
-   KIconLoader *loader = KGlobal::iconLoader();
+   KIconLoader *loader = TDEGlobal::iconLoader();
    m_floppyPixmap = loader->loadIcon( "3floppy_unmount", KIcon::Small );
    m_grayPixmap   = loader->loadIcon( "palette_gray", KIcon::Small );
    m_bwPixmap     = loader->loadIcon( "palette_lineart", KIcon::Small );
@@ -145,7 +145,7 @@ void ScanPackager::openRoots()
 
 KFileTreeBranch* ScanPackager::openRoot( const KURL& root, bool  )
 {
-   KIconLoader *loader = KGlobal::iconLoader();
+   KIconLoader *loader = TDEGlobal::iconLoader();
 
    /* working on the global branch. FIXME */
    m_defaultBranch = addBranch( root, i18n("Kooka Gallery"),
@@ -581,7 +581,7 @@ void ScanPackager::loadImageForItem( KFileTreeViewItem *item )
           kdDebug(28000) << "subImage-count: " << img->subImagesCount() << endl;
           if( img->subImagesCount() > 1 )
           {
-              KIconLoader *loader = KGlobal::iconLoader();
+              KIconLoader *loader = TDEGlobal::iconLoader();
               kdDebug(28000) << "SubImages existing!" << endl;
 
               /* Start at the image with index 1, that makes  one less than are actually in the
diff --git a/kooka/thumbview.cpp b/kooka/thumbview.cpp
index 570459f4..a61dbb6d 100644
--- a/kooka/thumbview.cpp
+++ b/kooka/thumbview.cpp
@@ -86,7 +86,7 @@ ThumbView::~ThumbView()
 
 bool ThumbView::readSettings()
 {
-   KConfig *cfg = KGlobal::config();
+   KConfig *cfg = TDEGlobal::config();
    cfg->setGroup( THUMB_GROUP );
    bool dirty = false;
 
@@ -481,7 +481,7 @@ void ThumbView::clear()
 
 void ThumbView::saveConfig()
 {
-   KConfig *cfg = KGlobal::config();
+   KConfig *cfg = TDEGlobal::config();
    cfg->setGroup( THUMB_GROUP );
 
    cfg->writeEntry( MARGIN_COLOR1, m_marginColor1 );