summaryrefslogtreecommitdiffstats
path: root/kcontrol/icons
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:30:47 -0600
commitcc74f360bb40da3d79f58048f8e8611804980aa6 (patch)
treec4385d2c16b904757b1c8bb998a4aec6993373f7 /kcontrol/icons
parent79b21d47bce1ee428affc97534cd8b257232a871 (diff)
downloadtdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.tar.gz
tdebase-cc74f360bb40da3d79f58048f8e8611804980aa6.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/icons')
-rw-r--r--kcontrol/icons/icons.cpp6
-rw-r--r--kcontrol/icons/icons.h6
-rw-r--r--kcontrol/icons/iconthemes.cpp12
-rw-r--r--kcontrol/icons/iconthemes.h2
-rw-r--r--kcontrol/icons/main.cpp2
-rw-r--r--kcontrol/icons/main.h6
6 files changed, 17 insertions, 17 deletions
diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp
index 8f9e46fbc..cd529485c 100644
--- a/kcontrol/icons/icons.cpp
+++ b/kcontrol/icons/icons.cpp
@@ -35,7 +35,7 @@
/**** KIconConfig ****/
KIconConfig::KIconConfig(TQWidget *parent, const char *name)
- : KCModule(parent, name)
+ : TDECModule(parent, name)
{
TQGridLayout *top = new TQGridLayout(this, 4, 2,
@@ -289,7 +289,7 @@ void KIconConfig::read()
mpKickerConfig->setGroup("General");
mQuickLaunchSize = mpKickerConfig->readNumEntry("panelIconWidth", KIcon::SizeLarge);
- KConfigGroup g( TDEGlobal::config(), "KDE" );
+ TDEConfigGroup g( TDEGlobal::config(), "KDE" );
mpRoundedCheck->setChecked(g.readBoolEntry("IconUseRoundedRect", KDE_DEFAULT_ICONTEXTROUNDED));
mpActiveEffectCheck->setChecked(g.readBoolEntry("ShowKonqIconActivationEffect", KDE_DEFAULT_KONQ_ACTIVATION_EFFECT));
}
@@ -473,7 +473,7 @@ void KIconConfig::save()
mpKickerConfig->setGroup("General");
mpKickerConfig->writeEntry("panelIconWidth", mQuickLaunchSize);
- KConfigGroup g( TDEGlobal::config(), "KDE" );
+ TDEConfigGroup g( TDEGlobal::config(), "KDE" );
g.writeEntry("IconUseRoundedRect", mpRoundedCheck->isChecked(), true, true);
g.writeEntry("ShowKonqIconActivationEffect", mpActiveEffectCheck->isChecked(), true, true);
diff --git a/kcontrol/icons/icons.h b/kcontrol/icons/icons.h
index cc94b6e8b..3c824af33 100644
--- a/kcontrol/icons/icons.h
+++ b/kcontrol/icons/icons.h
@@ -35,7 +35,7 @@ class TQTabWidget;
class TQWidget;
class KColorButton;
-class KConfig;
+class TDEConfig;
class KIconEffect;
class KIconLoader;
class KIconTheme;
@@ -53,7 +53,7 @@ struct Effect
/**
* The General Icons tab in kcontrol.
*/
-class KIconConfig: public KCModule
+class KIconConfig: public TDECModule
{
Q_OBJECT
@@ -106,7 +106,7 @@ private:
KIconEffect *mpEffect;
KIconTheme *mpTheme;
KIconLoader *mpLoader;
- KConfig *mpConfig;
+ TDEConfig *mpConfig;
KSimpleConfig *mpSystrayConfig;
KSimpleConfig *mpKickerConfig;
diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp
index 6e8824cce..835962ff6 100644
--- a/kcontrol/icons/iconthemes.cpp
+++ b/kcontrol/icons/iconthemes.cpp
@@ -52,7 +52,7 @@
#include "iconthemes.h"
IconThemesConfig::IconThemesConfig(TQWidget *parent, const char *name)
- : KCModule(parent, name)
+ : TDECModule(parent, name)
{
TQVBoxLayout *topLayout = new TQVBoxLayout(this, KDialog::marginHint(),
KDialog::spacingHint());
@@ -160,7 +160,7 @@ void IconThemesConfig::installNewTheme()
TQString themeTmpFile;
// themeTmpFile contains the name of the downloaded file
- if (!KIO::NetAccess::download(themeURL, themeTmpFile, this)) {
+ if (!TDEIO::NetAccess::download(themeURL, themeTmpFile, this)) {
TQString sorryText;
if (themeURL.isLocalFile())
sorryText = i18n("Unable to find the icon theme archive %1.");
@@ -176,7 +176,7 @@ void IconThemesConfig::installNewTheme()
TQString invalidArch(i18n("The file is not a valid icon theme archive."));
KMessageBox::error(this, invalidArch);
- KIO::NetAccess::removeTempFile(themeTmpFile);
+ TDEIO::NetAccess::removeTempFile(themeTmpFile);
return;
}
@@ -189,7 +189,7 @@ void IconThemesConfig::installNewTheme()
KMessageBox::error(this, somethingWrong);
}
- KIO::NetAccess::removeTempFile(themeTmpFile);
+ TDEIO::NetAccess::removeTempFile(themeTmpFile);
TDEGlobal::instance()->newIconLoader();
loadThemes();
@@ -296,11 +296,11 @@ void IconThemesConfig::removeSelectedTheme()
KIconTheme icontheme(m_themeNames[selected->text(0)]);
- // delete the index file before the async KIO::del so loadThemes() will
+ // delete the index file before the async TDEIO::del so loadThemes() will
// ignore that dir.
unlink(TQFile::encodeName(icontheme.dir()+"/index.theme").data());
unlink(TQFile::encodeName(icontheme.dir()+"/index.desktop").data());
- KIO::del(KURL( icontheme.dir() ));
+ TDEIO::del(KURL( icontheme.dir() ));
TDEGlobal::instance()->newIconLoader();
diff --git a/kcontrol/icons/iconthemes.h b/kcontrol/icons/iconthemes.h
index 6c13bba98..8eb9716fe 100644
--- a/kcontrol/icons/iconthemes.h
+++ b/kcontrol/icons/iconthemes.h
@@ -30,7 +30,7 @@ class TQCheckBox;
class TQStringList;
-class IconThemesConfig : public KCModule
+class IconThemesConfig : public TDECModule
{
Q_OBJECT
diff --git a/kcontrol/icons/main.cpp b/kcontrol/icons/main.cpp
index 2ced51361..8a9b564ac 100644
--- a/kcontrol/icons/main.cpp
+++ b/kcontrol/icons/main.cpp
@@ -37,7 +37,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_icons, IconsFactory("kcmicons") )
/**** IconModule ****/
IconModule::IconModule(TQWidget *parent, const char *name, const TQStringList &)
- : KCModule(IconsFactory::instance(), parent, name)
+ : TDECModule(IconsFactory::instance(), parent, name)
{
TQVBoxLayout *layout = new TQVBoxLayout(this);
tab = new TQTabWidget(this);
diff --git a/kcontrol/icons/main.h b/kcontrol/icons/main.h
index f9c1efc27..431f40254 100644
--- a/kcontrol/icons/main.h
+++ b/kcontrol/icons/main.h
@@ -29,7 +29,7 @@
#include <tqtabwidget.h>
#include <kcmodule.h>
-class IconModule : public KCModule
+class IconModule : public TDECModule
{
Q_OBJECT
@@ -47,8 +47,8 @@ protected slots:
private:
TQTabWidget *tab;
- KCModule *tab1;
- KCModule *tab2;
+ TDECModule *tab1;
+ TDECModule *tab2;
};