Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

6 files changed, 12 insertions, 12 deletions

diff --git a/digikam/libs/widgets/common/filesaveoptionsbox.cpp b/digikam/libs/widgets/common/filesaveoptionsbox.cpp
index 8059bbd..946515c 100644
--- a/digikam/libs/widgets/common/filesaveoptionsbox.cpp
+++ b/digikam/libs/widgets/common/filesaveoptionsbox.cpp
@@ -156,7 +156,7 @@ void FileSaveOptionsBox::toggleFormatOptions(const TQString& format)
 
 void FileSaveOptionsBox::applySettings()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup("ImageViewer Settings");
     config->writeEntry("JPEGCompression", d->JPEGOptions->getCompressionValue());
     config->writeEntry("JPEGSubSampling", d->JPEGOptions->getSubSamplingValue());
@@ -169,7 +169,7 @@ void FileSaveOptionsBox::applySettings()
 
 void FileSaveOptionsBox::readSettings()
 {
-    KConfig* config = kapp->config();
+    TDEConfig* config = kapp->config();
     config->setGroup("ImageViewer Settings");
     d->JPEGOptions->setCompressionValue( config->readNumEntry("JPEGCompression", 75) );
     d->JPEGOptions->setSubSamplingValue( config->readNumEntry("JPEGSubSampling", 1) );  // Medium subsampling
diff --git a/digikam/libs/widgets/common/searchtextbar.cpp b/digikam/libs/widgets/common/searchtextbar.cpp
index 4a9d886..678aed2 100644
--- a/digikam/libs/widgets/common/searchtextbar.cpp
+++ b/digikam/libs/widgets/common/searchtextbar.cpp
@@ -185,7 +185,7 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString
     connect(d->searchEdit, TQT_SIGNAL(textChanged(const TQString&)),
             this, TQT_SLOT(slotTextChanged(const TQString&)));
 
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(name + TQString(" Search Text Tool"));
     d->searchEdit->setCompletionMode((TDEGlobalSettings::Completion)config->readNumEntry("AutoCompletionMode", 
                                       (int)TDEGlobalSettings::CompletionAuto));
@@ -193,7 +193,7 @@ SearchTextBar::SearchTextBar(TQWidget *parent, const char* name, const TQString
 
 SearchTextBar::~SearchTextBar()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(name() + TQString(" Search Text Tool"));
     config->writeEntry("AutoCompletionMode", (int)d->searchEdit->completionMode());
     config->sync();
diff --git a/digikam/libs/widgets/common/sidebar.cpp b/digikam/libs/widgets/common/sidebar.cpp
index e76c1f7..d0c606f 100644
--- a/digikam/libs/widgets/common/sidebar.cpp
+++ b/digikam/libs/widgets/common/sidebar.cpp
@@ -140,7 +140,7 @@ TQSplitter* Sidebar::splitter() const
 
 void Sidebar::loadViewState()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(TQString("%1").arg(name()));
 
     int tab        = config->readNumEntry("ActiveTab", 0);
@@ -167,7 +167,7 @@ void Sidebar::loadViewState()
 
 void Sidebar::saveViewState()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(TQString("%1").arg(name()));
     config->writeEntry("ActiveTab", d->activeTab);
     config->writeEntry("Minimized", d->minimized);
diff --git a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp
index e74c682..ad065ac 100644
--- a/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp
+++ b/digikam/libs/widgets/imageplugins/imagepanelwidget.cpp
@@ -212,7 +212,7 @@ ImageRegionWidget *ImagePanelWidget::previewWidget() const
 
 void ImagePanelWidget::readSettings()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(d->settingsSection);
     int mode = config->readNumEntry("Separate View", ImageRegionWidget::SeparateViewDuplicateVert);
     mode     = TQMAX(ImageRegionWidget::SeparateViewHorizontal, mode);
@@ -231,7 +231,7 @@ void ImagePanelWidget::readSettings()
 
 void ImagePanelWidget::writeSettings()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(d->settingsSection);
     config->writeEntry( "Separate View", d->separateView->selectedId() );
     config->sync();
diff --git a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp
index cd13cff..1359147 100644
--- a/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp
+++ b/digikam/libs/widgets/imageplugins/imagepannelwidget.cpp
@@ -291,7 +291,7 @@ ImagePannelWidget::~ImagePannelWidget()
 
 void ImagePannelWidget::readSettings()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(d->settingsSection);
     int mode = config->readNumEntry("Separate View", ImageRegionWidget::SeparateViewDuplicateVert);
     mode     = TQMAX(ImageRegionWidget::SeparateViewHorizontal, mode);
@@ -310,7 +310,7 @@ void ImagePannelWidget::readSettings()
     
 void ImagePannelWidget::writeSettings()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(d->settingsSection);
     config->writeEntry( "Separate View", d->separateView->selectedId() );
     config->sync();
diff --git a/digikam/libs/widgets/imageplugins/imagewidget.cpp b/digikam/libs/widgets/imageplugins/imagewidget.cpp
index 3e45bf8..ad3cb1b 100644
--- a/digikam/libs/widgets/imageplugins/imagewidget.cpp
+++ b/digikam/libs/widgets/imageplugins/imagewidget.cpp
@@ -322,7 +322,7 @@ void ImageWidget::slotUpdateSpotInfo(const Digikam::DColor &col, const TQPoint &
 
 void ImageWidget::readSettings()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(d->settingsSection);
 
     d->underExposureButton->setOn(config->readBoolEntry("Under Exposure Indicator", false));
@@ -336,7 +336,7 @@ void ImageWidget::readSettings()
     
 void ImageWidget::writeSettings()
 {
-    KConfig *config = kapp->config();
+    TDEConfig *config = kapp->config();
     config->setGroup(d->settingsSection);
     config->writeEntry("Separate View", getRenderingPreviewMode());
     config->writeEntry("Under Exposure Indicator", d->underExposureButton->isOn());