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

9 files changed, 44 insertions, 44 deletions

diff --git a/digikam/libs/widgets/common/dlogoaction.cpp b/digikam/libs/widgets/common/dlogoaction.cpp
index 39dba95..64ea166 100644
--- a/digikam/libs/widgets/common/dlogoaction.cpp
+++ b/digikam/libs/widgets/common/dlogoaction.cpp
@@ -64,8 +64,8 @@ int DLogoAction::plug(TQWidget *widget, int index)
         pixmapLogo->setScaledContents(false);
         pixmapLogo->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum));
         TQToolTip::add(pixmapLogo, i18n("Visit digiKam project website"));
-        KGlobal::dirs()->addResourceType("banner-digikam", KGlobal::dirs()->kde_default("data") + "digikam/data");
-        TQString directory = KGlobal::dirs()->findResourceDir("banner-digikam", "banner-digikam.png");
+        TDEGlobal::dirs()->addResourceType("banner-digikam", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+        TQString directory = TDEGlobal::dirs()->findResourceDir("banner-digikam", "banner-digikam.png");
         pixmapLogo->setPixmap(TQPixmap( directory + "banner-digikam.png" ));
         pixmapLogo->setFocusPolicy(TQ_NoFocus);
 
diff --git a/digikam/libs/widgets/common/searchtextbar.cpp b/digikam/libs/widgets/common/searchtextbar.cpp
index 5cc07c0..4a9d886 100644
--- a/digikam/libs/widgets/common/searchtextbar.cpp
+++ b/digikam/libs/widgets/common/searchtextbar.cpp
@@ -187,8 +187,8 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString
 
     KConfig *config = kapp->config();
     config->setGroup(name + TQString(" Search Text Tool"));
-    d->searchEdit->setCompletionMode((KGlobalSettings::Completion)config->readNumEntry("AutoCompletionMode", 
-                                      (int)KGlobalSettings::CompletionAuto));
+    d->searchEdit->setCompletionMode((TDEGlobalSettings::Completion)config->readNumEntry("AutoCompletionMode", 
+                                      (int)TDEGlobalSettings::CompletionAuto));
 }
 
 SearchTextBar::~SearchTextBar()
diff --git a/digikam/libs/widgets/common/splashscreen.cpp b/digikam/libs/widgets/common/splashscreen.cpp
index 422f80f..6ce56c7 100644
--- a/digikam/libs/widgets/common/splashscreen.cpp
+++ b/digikam/libs/widgets/common/splashscreen.cpp
@@ -135,7 +135,7 @@ void SplashScreen::drawContents(TQPainter* painter)
 
     painter->setPen(d->color);
 
-    TQFont fnt(KGlobalSettings::generalFont());
+    TQFont fnt(TDEGlobalSettings::generalFont());
     int fntSize = fnt.pointSize();
     if (fntSize > 0)
     {
diff --git a/digikam/libs/widgets/common/statusled.cpp b/digikam/libs/widgets/common/statusled.cpp
index 515762a..4e1e5f3 100644
--- a/digikam/libs/widgets/common/statusled.cpp
+++ b/digikam/libs/widgets/common/statusled.cpp
@@ -70,8 +70,8 @@ void StatusLed::setLedColor(LedColor color)
             break;
     }
 
-    KGlobal::dirs()->addResourceType(file.ascii(), KGlobal::dirs()->kde_default("data") + "digikam/data");
-    TQString directory = KGlobal::dirs()->findResourceDir(file.ascii(), file + TQString(".png"));
+    TDEGlobal::dirs()->addResourceType(file.ascii(), TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+    TQString directory = TDEGlobal::dirs()->findResourceDir(file.ascii(), file + TQString(".png"));
     setPixmap(TQPixmap(directory + file + TQString(".png")));
 }
 
diff --git a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp
index 48fee35..e74c682 100644
--- a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp
+++ b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp
@@ -112,8 +112,8 @@ ImagePanelWidget::ImagePanelWidget(uint w, uint h, const TQString& settingsSecti
     {
        TQPushButton *duplicateHorButton = new TQPushButton( d->separateView );
        d->separateView->insert(duplicateHorButton, ImageRegionWidget::SeparateViewDuplicateHorz);
-       KGlobal::dirs()->addResourceType("duplicatebothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data");
-       directory = KGlobal::dirs()->findResourceDir("duplicatebothhorz", "duplicatebothhorz.png");
+       TDEGlobal::dirs()->addResourceType("duplicatebothhorz", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+       directory = TDEGlobal::dirs()->findResourceDir("duplicatebothhorz", "duplicatebothhorz.png");
        duplicateHorButton->setPixmap( TQPixmap( directory + "duplicatebothhorz.png" ) );
        duplicateHorButton->setToggleButton(true);
        TQWhatsThis::add( duplicateHorButton, i18n("<p>If you enable this option, you will separate the preview area "
@@ -123,8 +123,8 @@ ImagePanelWidget::ImagePanelWidget(uint w, uint h, const TQString& settingsSecti
 
        TQPushButton *duplicateVerButton = new TQPushButton( d->separateView );
        d->separateView->insert(duplicateVerButton, ImageRegionWidget::SeparateViewDuplicateVert);
-       KGlobal::dirs()->addResourceType("duplicatebothvert", KGlobal::dirs()->kde_default("data") + "digikam/data");
-       directory = KGlobal::dirs()->findResourceDir("duplicatebothvert", "duplicatebothvert.png");
+       TDEGlobal::dirs()->addResourceType("duplicatebothvert", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+       directory = TDEGlobal::dirs()->findResourceDir("duplicatebothvert", "duplicatebothvert.png");
        duplicateVerButton->setPixmap( TQPixmap( directory + "duplicatebothvert.png" ) );
        duplicateVerButton->setToggleButton(true);
        TQWhatsThis::add( duplicateVerButton, i18n("<p>If you enable this option, you will separate the preview area "
@@ -138,8 +138,8 @@ ImagePanelWidget::ImagePanelWidget(uint w, uint h, const TQString& settingsSecti
     {
        TQPushButton *separateHorButton = new TQPushButton( d->separateView );
        d->separateView->insert(separateHorButton, ImageRegionWidget::SeparateViewHorizontal);
-       KGlobal::dirs()->addResourceType("bothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data");
-       directory = KGlobal::dirs()->findResourceDir("bothhorz", "bothhorz.png");
+       TDEGlobal::dirs()->addResourceType("bothhorz", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+       directory = TDEGlobal::dirs()->findResourceDir("bothhorz", "bothhorz.png");
        separateHorButton->setPixmap( TQPixmap( directory + "bothhorz.png" ) );
        separateHorButton->setToggleButton(true);
        TQWhatsThis::add( separateHorButton, i18n( "<p>If you enable this option, you will separate the preview area "
@@ -149,8 +149,8 @@ ImagePanelWidget::ImagePanelWidget(uint w, uint h, const TQString& settingsSecti
 
        TQPushButton *separateVerButton = new TQPushButton( d->separateView );
        d->separateView->insert(separateVerButton, ImageRegionWidget::SeparateViewVertical);
-       KGlobal::dirs()->addResourceType("bothvert", KGlobal::dirs()->kde_default("data") + "digikam/data");
-       directory = KGlobal::dirs()->findResourceDir("bothvert", "bothvert.png");
+       TDEGlobal::dirs()->addResourceType("bothvert", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+       directory = TDEGlobal::dirs()->findResourceDir("bothvert", "bothvert.png");
        separateVerButton->setPixmap( TQPixmap( directory + "bothvert.png" ) );
        separateVerButton->setToggleButton(true);
        TQWhatsThis::add( separateVerButton, i18n( "<p>If you enable this option, you will separate the preview area "
@@ -161,8 +161,8 @@ ImagePanelWidget::ImagePanelWidget(uint w, uint h, const TQString& settingsSecti
 
     TQPushButton *noSeparateButton = new TQPushButton( d->separateView );
     d->separateView->insert(noSeparateButton, ImageRegionWidget::SeparateViewNone);
-    KGlobal::dirs()->addResourceType("target", KGlobal::dirs()->kde_default("data") + "digikam/data");
-    directory = KGlobal::dirs()->findResourceDir("target", "target.png");
+    TDEGlobal::dirs()->addResourceType("target", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+    directory = TDEGlobal::dirs()->findResourceDir("target", "target.png");
     noSeparateButton->setPixmap( TQPixmap( directory + "target.png" ) );
     noSeparateButton->setToggleButton(true);
     TQWhatsThis::add( noSeparateButton, i18n( "<p>If you enable this option, the preview area will not "
diff --git a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp
index 3efe93c..cd13cff 100644
--- a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp
+++ b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp
@@ -152,8 +152,8 @@ ImagePannelWidget::ImagePannelWidget(uint w, uint h, const TQString& settingsSec
     {
        TQPushButton *duplicateHorButton = new TQPushButton( d->separateView );
        d->separateView->insert(duplicateHorButton, ImageRegionWidget::SeparateViewDuplicateHorz);
-       KGlobal::dirs()->addResourceType("duplicatebothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data");
-       directory = KGlobal::dirs()->findResourceDir("duplicatebothhorz", "duplicatebothhorz.png");
+       TDEGlobal::dirs()->addResourceType("duplicatebothhorz", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+       directory = TDEGlobal::dirs()->findResourceDir("duplicatebothhorz", "duplicatebothhorz.png");
        duplicateHorButton->setPixmap( TQPixmap( directory + "duplicatebothhorz.png" ) );
        duplicateHorButton->setToggleButton(true);
        TQWhatsThis::add( duplicateHorButton, i18n("<p>If you enable this option, you will separate the preview area "
@@ -163,8 +163,8 @@ ImagePannelWidget::ImagePannelWidget(uint w, uint h, const TQString& settingsSec
         
        TQPushButton *duplicateVerButton = new TQPushButton( d->separateView );
        d->separateView->insert(duplicateVerButton, ImageRegionWidget::SeparateViewDuplicateVert);
-       KGlobal::dirs()->addResourceType("duplicatebothvert", KGlobal::dirs()->kde_default("data") + "digikam/data");
-       directory = KGlobal::dirs()->findResourceDir("duplicatebothvert", "duplicatebothvert.png");
+       TDEGlobal::dirs()->addResourceType("duplicatebothvert", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+       directory = TDEGlobal::dirs()->findResourceDir("duplicatebothvert", "duplicatebothvert.png");
        duplicateVerButton->setPixmap( TQPixmap( directory + "duplicatebothvert.png" ) );
        duplicateVerButton->setToggleButton(true);
        TQWhatsThis::add( duplicateVerButton, i18n("<p>If you enable this option, you will separate the preview area "
@@ -178,8 +178,8 @@ ImagePannelWidget::ImagePannelWidget(uint w, uint h, const TQString& settingsSec
     {
        TQPushButton *separateHorButton = new TQPushButton( d->separateView );
        d->separateView->insert(separateHorButton, ImageRegionWidget::SeparateViewHorizontal);
-       KGlobal::dirs()->addResourceType("bothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data");
-       directory = KGlobal::dirs()->findResourceDir("bothhorz", "bothhorz.png");
+       TDEGlobal::dirs()->addResourceType("bothhorz", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+       directory = TDEGlobal::dirs()->findResourceDir("bothhorz", "bothhorz.png");
        separateHorButton->setPixmap( TQPixmap( directory + "bothhorz.png" ) );
        separateHorButton->setToggleButton(true);
        TQWhatsThis::add( separateHorButton, i18n( "<p>If you enable this option, you will separate the preview area "
@@ -189,8 +189,8 @@ ImagePannelWidget::ImagePannelWidget(uint w, uint h, const TQString& settingsSec
         
        TQPushButton *separateVerButton = new TQPushButton( d->separateView );
        d->separateView->insert(separateVerButton, ImageRegionWidget::SeparateViewVertical);
-       KGlobal::dirs()->addResourceType("bothvert", KGlobal::dirs()->kde_default("data") + "digikam/data");
-       directory = KGlobal::dirs()->findResourceDir("bothvert", "bothvert.png");
+       TDEGlobal::dirs()->addResourceType("bothvert", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+       directory = TDEGlobal::dirs()->findResourceDir("bothvert", "bothvert.png");
        separateVerButton->setPixmap( TQPixmap( directory + "bothvert.png" ) );
        separateVerButton->setToggleButton(true);
        TQWhatsThis::add( separateVerButton, i18n( "<p>If you enable this option, you will separate the preview area "
@@ -201,8 +201,8 @@ ImagePannelWidget::ImagePannelWidget(uint w, uint h, const TQString& settingsSec
        
     TQPushButton *noSeparateButton = new TQPushButton( d->separateView );
     d->separateView->insert(noSeparateButton, ImageRegionWidget::SeparateViewNone);
-    KGlobal::dirs()->addResourceType("target", KGlobal::dirs()->kde_default("data") + "digikam/data");
-    directory = KGlobal::dirs()->findResourceDir("target", "target.png");
+    TDEGlobal::dirs()->addResourceType("target", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+    directory = TDEGlobal::dirs()->findResourceDir("target", "target.png");
     noSeparateButton->setPixmap( TQPixmap( directory + "target.png" ) );
     noSeparateButton->setToggleButton(true);
     TQWhatsThis::add( noSeparateButton, i18n( "<p>If you enable this option, the preview area will not "
diff --git a/digikam/libs/widgets/imageplugins/imagewidget.cpp b/digikam/libs/widgets/imageplugins/imagewidget.cpp
index f127621..3e45bf8 100644
--- a/digikam/libs/widgets/imageplugins/imagewidget.cpp
+++ b/digikam/libs/widgets/imageplugins/imagewidget.cpp
@@ -98,8 +98,8 @@ ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *parent,
 
     TQPushButton *previewOriginalButton = new TQPushButton( d->previewButtons );
     d->previewButtons->insert(previewOriginalButton, ImageGuideWidget::PreviewOriginalImage);
-    KGlobal::dirs()->addResourceType("original", KGlobal::dirs()->kde_default("data") + "digikam/data");
-    TQString directory = KGlobal::dirs()->findResourceDir("original", "original.png");
+    TDEGlobal::dirs()->addResourceType("original", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+    TQString directory = TDEGlobal::dirs()->findResourceDir("original", "original.png");
     previewOriginalButton->setPixmap( TQPixmap( directory + "original.png" ) );
     previewOriginalButton->setToggleButton(true);
     TQWhatsThis::add( previewOriginalButton, i18n( "<p>If you enable this option, you will see "
@@ -107,8 +107,8 @@ ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *parent,
 
     TQPushButton *previewBothButtonVert = new TQPushButton( d->previewButtons );
     d->previewButtons->insert(previewBothButtonVert, ImageGuideWidget::PreviewBothImagesVertCont);
-    KGlobal::dirs()->addResourceType("bothvert", KGlobal::dirs()->kde_default("data") + "digikam/data");
-    directory = KGlobal::dirs()->findResourceDir("bothvert", "bothvert.png");
+    TDEGlobal::dirs()->addResourceType("bothvert", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+    directory = TDEGlobal::dirs()->findResourceDir("bothvert", "bothvert.png");
     previewBothButtonVert->setPixmap( TQPixmap( directory + "bothvert.png" ) );
     previewBothButtonVert->setToggleButton(true);
     TQWhatsThis::add( previewBothButtonVert, i18n( "<p>If you enable this option, the preview area will "
@@ -119,8 +119,8 @@ ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *parent,
 
     TQPushButton *previewBothButtonHorz = new TQPushButton( d->previewButtons );
     d->previewButtons->insert(previewBothButtonHorz, ImageGuideWidget::PreviewBothImagesHorzCont);
-    KGlobal::dirs()->addResourceType("bothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data");
-    directory = KGlobal::dirs()->findResourceDir("bothhorz", "bothhorz.png");
+    TDEGlobal::dirs()->addResourceType("bothhorz", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+    directory = TDEGlobal::dirs()->findResourceDir("bothhorz", "bothhorz.png");
     previewBothButtonHorz->setPixmap( TQPixmap( directory + "bothhorz.png" ) );
     previewBothButtonHorz->setToggleButton(true);
     TQWhatsThis::add( previewBothButtonHorz, i18n( "<p>If you enable this option, the preview area will "
@@ -131,8 +131,8 @@ ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *parent,
 
     TQPushButton *previewDuplicateBothButtonVert = new TQPushButton( d->previewButtons );
     d->previewButtons->insert(previewDuplicateBothButtonVert, ImageGuideWidget::PreviewBothImagesVert);
-    KGlobal::dirs()->addResourceType("duplicatebothvert", KGlobal::dirs()->kde_default("data") + "digikam/data");
-    directory = KGlobal::dirs()->findResourceDir("duplicatebothvert", "duplicatebothvert.png");
+    TDEGlobal::dirs()->addResourceType("duplicatebothvert", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+    directory = TDEGlobal::dirs()->findResourceDir("duplicatebothvert", "duplicatebothvert.png");
     previewDuplicateBothButtonVert->setPixmap( TQPixmap( directory + "duplicatebothvert.png" ) );
     previewDuplicateBothButtonVert->setToggleButton(true);
     TQWhatsThis::add( previewDuplicateBothButtonVert, i18n( "<p>If you enable this option, the preview area will "
@@ -142,8 +142,8 @@ ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *parent,
 
     TQPushButton *previewDupplicateBothButtonHorz = new TQPushButton( d->previewButtons );
     d->previewButtons->insert(previewDupplicateBothButtonHorz, ImageGuideWidget::PreviewBothImagesHorz);
-    KGlobal::dirs()->addResourceType("duplicatebothhorz", KGlobal::dirs()->kde_default("data") + "digikam/data");
-    directory = KGlobal::dirs()->findResourceDir("duplicatebothhorz", "duplicatebothhorz.png");
+    TDEGlobal::dirs()->addResourceType("duplicatebothhorz", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+    directory = TDEGlobal::dirs()->findResourceDir("duplicatebothhorz", "duplicatebothhorz.png");
     previewDupplicateBothButtonHorz->setPixmap( TQPixmap( directory + "duplicatebothhorz.png" ) );
     previewDupplicateBothButtonHorz->setToggleButton(true);
     TQWhatsThis::add( previewDupplicateBothButtonHorz, i18n( "<p>If you enable this option, the preview area will "
@@ -153,8 +153,8 @@ ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *parent,
 
     TQPushButton *previewtargetButton = new TQPushButton( d->previewButtons );
     d->previewButtons->insert(previewtargetButton, ImageGuideWidget::PreviewTargetImage);
-    KGlobal::dirs()->addResourceType("target", KGlobal::dirs()->kde_default("data") + "digikam/data");
-    directory = KGlobal::dirs()->findResourceDir("target", "target.png");
+    TDEGlobal::dirs()->addResourceType("target", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+    directory = TDEGlobal::dirs()->findResourceDir("target", "target.png");
     previewtargetButton->setPixmap( TQPixmap( directory + "target.png" ) );
     previewtargetButton->setToggleButton(true);
     TQWhatsThis::add( previewtargetButton, i18n( "<p>If you enable this option, you will see "
@@ -162,8 +162,8 @@ ImageWidget::ImageWidget(const TQString& settingsSection, TQWidget *parent,
 
     TQPushButton *previewToggleMouseOverButton = new TQPushButton( d->previewButtons );
     d->previewButtons->insert(previewToggleMouseOverButton, ImageGuideWidget::PreviewToggleOnMouseOver);
-    KGlobal::dirs()->addResourceType("togglemouseover", KGlobal::dirs()->kde_default("data") + "digikam/data");
-    directory = KGlobal::dirs()->findResourceDir("togglemouseover", "togglemouseover.png");
+    TDEGlobal::dirs()->addResourceType("togglemouseover", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+    directory = TDEGlobal::dirs()->findResourceDir("togglemouseover", "togglemouseover.png");
     previewToggleMouseOverButton->setPixmap( TQPixmap( directory + "togglemouseover.png" ) );
     previewToggleMouseOverButton->setToggleButton(true);
     TQWhatsThis::add( previewToggleMouseOverButton, i18n( "<p>If you enable this option, you will see "
diff --git a/digikam/libs/widgets/metadata/metadatawidget.cpp b/digikam/libs/widgets/metadata/metadatawidget.cpp
index 3b14942..9391deb 100644
--- a/digikam/libs/widgets/metadata/metadatawidget.cpp
+++ b/digikam/libs/widgets/metadata/metadatawidget.cpp
@@ -373,7 +373,7 @@ void MetadataWidget::slotPrintMetadata()
 
 KURL MetadataWidget::saveMetadataToFile(const TQString& caption, const TQString& fileFilter)
 {
-    KFileDialog fileSaveDialog(KGlobalSettings::documentPath(),
+    KFileDialog fileSaveDialog(TDEGlobalSettings::documentPath(),
                                TQString(),
                                this,
                                "MetadataFileSaveDialog",
diff --git a/digikam/libs/widgets/metadata/worldmapwidget.cpp b/digikam/libs/widgets/metadata/worldmapwidget.cpp
index 2d3d694..cd59df3 100644
--- a/digikam/libs/widgets/metadata/worldmapwidget.cpp
+++ b/digikam/libs/widgets/metadata/worldmapwidget.cpp
@@ -102,8 +102,8 @@ TQPixmap &WorldMapWidget::worldMapPixmap()
 {
     if (!d->worldMap)
     {
-        KGlobal::dirs()->addResourceType("worldmap", KGlobal::dirs()->kde_default("data") + "digikam/data");
-        TQString directory = KGlobal::dirs()->findResourceDir("worldmap", "worldmap.jpg");
+        TDEGlobal::dirs()->addResourceType("worldmap", TDEGlobal::dirs()->kde_default("data") + "digikam/data");
+        TQString directory = TDEGlobal::dirs()->findResourceDir("worldmap", "worldmap.jpg");
         pixmapDeleter.setObject(d->worldMap, new TQPixmap(directory + "worldmap.jpg"));
     }
     return *d->worldMap;