diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:42:09 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:42:09 -0600 |
| commit | b1b005cf854aad925c2e64c3fc3ece582d4bffcf (patch) | |
| tree | 53d452bd876320e4462a2a6ab4fa51b0111d8c02 /twin-styles/glow | |
| parent | 36117c8a3e07af8406a8e3c05748a785d6e53078 (diff) | |
| download | tdeartwork-b1b005cf854aad925c2e64c3fc3ece582d4bffcf.tar.gz tdeartwork-b1b005cf854aad925c2e64c3fc3ece582d4bffcf.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'twin-styles/glow')
| -rw-r--r-- | twin-styles/glow/config/glowconfigdialog.cpp | 6 | ||||
| -rw-r--r-- | twin-styles/glow/glowclient.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/twin-styles/glow/config/glowconfigdialog.cpp b/twin-styles/glow/config/glowconfigdialog.cpp index ab3b50b3..312af343 100644 --- a/twin-styles/glow/config/glowconfigdialog.cpp +++ b/twin-styles/glow/config/glowconfigdialog.cpp @@ -55,7 +55,7 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent ) : TQObject(parent) { _glowConfig = new KConfig("twinglowrc"); - KGlobal::locale()->insertCatalogue("twin_glow_config"); + TDEGlobal::locale()->insertCatalogue("twin_glow_config"); _main_group_box = new TQWidget(parent); TQVBoxLayout *main_group_boxLayout = new TQVBoxLayout(_main_group_box); @@ -138,7 +138,7 @@ GlowConfigDialog::GlowConfigDialog( KConfig * conf, TQWidget * parent ) TQHBoxLayout *titlebarGradientTypeLayout = new TQHBoxLayout(); _titlebarGradientTypeComboBox = new TQComboBox(_main_group_box); - KConfig *c = KGlobal::config(); + KConfig *c = TDEGlobal::config(); KConfigGroupSaver cgs( c, TQString::fromLatin1("WM") ); TQColor activeBackground = c->readColorEntry("activeBackground"); TQColor activeBlend = c->readColorEntry("activeBlend"); @@ -273,7 +273,7 @@ void GlowConfigDialog::defaults() void GlowConfigDialog::slotLoadThemeList () { - TQStringList dir_list=KGlobal::dirs()->findDirs("data", "twin/glow-themes"); + TQStringList dir_list=TDEGlobal::dirs()->findDirs("data", "twin/glow-themes"); TQStringList::ConstIterator it; diff --git a/twin-styles/glow/glowclient.cpp b/twin-styles/glow/glowclient.cpp index 5f4abe3f..81be88d7 100644 --- a/twin-styles/glow/glowclient.cpp +++ b/twin-styles/glow/glowclient.cpp @@ -164,7 +164,7 @@ GlowClientGlobals::borderSizes() const void GlowClientGlobals::readTheme() { - TQString theme_config_file = KGlobal::dirs()->findResource ("data", + TQString theme_config_file = TDEGlobal::dirs()->findResource ("data", TQString("twin/glow-themes/") + config()->themeName + "/" + config()->themeName + ".theme"); if (theme_config_file.isNull()) @@ -290,7 +290,7 @@ const TQString GlowClientGlobals::getPixmapTypeName(PixmapType type) bool GlowClientGlobals::createPixmap(PixmapType type, bool isActive) { - TQString theme_dir = KGlobal::dirs()->findResource ("data", + TQString theme_dir = TDEGlobal::dirs()->findResource ("data", TQString("twin/glow-themes/") + _config->themeName + "/"); TQColor glow_color; |