summaryrefslogtreecommitdiffstats
path: root/kcontrol/style
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/style')
-rw-r--r--kcontrol/style/kcmstyle.cpp8
-rw-r--r--kcontrol/style/keramik/keramikconf.cpp4
-rw-r--r--kcontrol/style/menupreview.cpp2
3 files changed, 7 insertions, 7 deletions
diff --git a/kcontrol/style/kcmstyle.cpp b/kcontrol/style/kcmstyle.cpp
index 274113bfb..3a2025589 100644
--- a/kcontrol/style/kcmstyle.cpp
+++ b/kcontrol/style/kcmstyle.cpp
@@ -75,7 +75,7 @@ extern "C"
{
KDE_EXPORT KCModule *create_style(TQWidget *parent, const char*)
{
- KGlobal::locale()->insertCatalogue("kcmstyle");
+ TDEGlobal::locale()->insertCatalogue("kcmstyle");
return new KCMStyle(parent, "kcmstyle");
}
@@ -96,7 +96,7 @@ extern "C"
TQByteArray properties;
TQDataStream d(properties, IO_WriteOnly);
d.setVersion( 3 ); // Qt2 apps need this.
- d << kapp->palette() << KGlobalSettings::generalFont();
+ d << kapp->palette() << TDEGlobalSettings::generalFont();
Atom a = XInternAtom(tqt_xdisplay(), "_QT_DESKTOP_PROPERTIES", false);
// do it for all root windows - multihead support
@@ -127,7 +127,7 @@ KCMStyle::KCMStyle( TQWidget* parent, const char* name )
m_bStyleDirty= false;
m_bToolbarsDirty = false;
- KGlobal::dirs()->addResourceType("themes",
+ TDEGlobal::dirs()->addResourceType("themes",
KStandardDirs::kde_default("data") + "kstyle/themes");
TDEAboutData *about =
@@ -727,7 +727,7 @@ void KCMStyle::loadStyle( KConfig& config )
styleEntries.setAutoDelete(true);
TQString strWidgetStyle;
- TQStringList list = KGlobal::dirs()->findAllResources("themes", "*.themerc", true, true);
+ TQStringList list = TDEGlobal::dirs()->findAllResources("themes", "*.themerc", true, true);
for (TQStringList::iterator it = list.begin(); it != list.end(); ++it)
{
KSimpleConfig config( *it, true );
diff --git a/kcontrol/style/keramik/keramikconf.cpp b/kcontrol/style/keramik/keramikconf.cpp
index 0350ab969..3027106cd 100644
--- a/kcontrol/style/keramik/keramikconf.cpp
+++ b/kcontrol/style/keramik/keramikconf.cpp
@@ -42,7 +42,7 @@ KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent)
{
//Should have no margins here, the dialog provides them
TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0);
- KGlobal::locale()->insertCatalogue("kstyle_keramik_config");
+ TDEGlobal::locale()->insertCatalogue("kstyle_keramik_config");
//highlightLineEdits = new TQCheckBox(i18n("Highlight active lineedits"), this);
highlightScrollBar = new TQCheckBox(i18n("Highlight scroll bar handles"), this);
@@ -70,7 +70,7 @@ KeramikStyleConfig::KeramikStyleConfig(TQWidget* parent): TQWidget(parent)
KeramikStyleConfig::~KeramikStyleConfig()
{
- KGlobal::locale()->removeCatalogue("kstyle_keramik_config");
+ TDEGlobal::locale()->removeCatalogue("kstyle_keramik_config");
}
diff --git a/kcontrol/style/menupreview.cpp b/kcontrol/style/menupreview.cpp
index 190f0517f..bad8270e0 100644
--- a/kcontrol/style/menupreview.cpp
+++ b/kcontrol/style/menupreview.cpp
@@ -82,7 +82,7 @@ void MenuPreview::createPixmaps()
(x % 2) ?
((y % 2) ? c2 : c1 ) : // See the grid? ;-)
((y % 2) ? c1 : c2 ) );
- KIconLoader* icl = KGlobal::iconLoader();
+ KIconLoader* icl = TDEGlobal::iconLoader();
TQPixmap pix = icl->loadIcon("go", KIcon::Desktop, KIcon::SizeLarge, KIcon::ActiveState);
p.drawPixmap( (width()-2-pix.width())/2, (height()-2-pix.height())/2, pix );
}