summaryrefslogtreecommitdiffstats
path: root/twin-styles
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:42:09 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:42:09 -0600
commitb1b005cf854aad925c2e64c3fc3ece582d4bffcf (patch)
tree53d452bd876320e4462a2a6ab4fa51b0111d8c02 /twin-styles
parent36117c8a3e07af8406a8e3c05748a785d6e53078 (diff)
downloadtdeartwork-b1b005cf854aad925c2e64c3fc3ece582d4bffcf.tar.gz
tdeartwork-b1b005cf854aad925c2e64c3fc3ece582d4bffcf.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'twin-styles')
-rw-r--r--twin-styles/cde/config/config.cpp2
-rw-r--r--twin-styles/glow/config/glowconfigdialog.cpp6
-rw-r--r--twin-styles/glow/glowclient.cpp4
-rw-r--r--twin-styles/icewm/config/config.cpp6
-rw-r--r--twin-styles/smooth-blend/client/config/smoothblendconfig.cc2
5 files changed, 10 insertions, 10 deletions
diff --git a/twin-styles/cde/config/config.cpp b/twin-styles/cde/config/config.cpp
index 41631d57..4a6b9f44 100644
--- a/twin-styles/cde/config/config.cpp
+++ b/twin-styles/cde/config/config.cpp
@@ -24,7 +24,7 @@ CdeConfig::CdeConfig( KConfig* conf, TQWidget* parent )
: TQObject( parent )
{
cdeConfig = new KConfig("twincderc");
- KGlobal::locale()->insertCatalogue("twin_art_clients");
+ TDEGlobal::locale()->insertCatalogue("twin_art_clients");
groupBox = new TQVBox( parent );
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;
diff --git a/twin-styles/icewm/config/config.cpp b/twin-styles/icewm/config/config.cpp
index a9db9993..8942467f 100644
--- a/twin-styles/icewm/config/config.cpp
+++ b/twin-styles/icewm/config/config.cpp
@@ -59,7 +59,7 @@ IceWMConfig::IceWMConfig( KConfig* conf, TQWidget* parent )
: TQObject( parent )
{
icewmConfig = new KConfig("twinicewmrc");
- KGlobal::locale()->insertCatalogue("twin_art_clients");
+ TDEGlobal::locale()->insertCatalogue("twin_art_clients");
mainWidget = new TQVBox( parent );
mainWidget->setSpacing( KDialog::spacingHint() );
@@ -123,7 +123,7 @@ IceWMConfig::IceWMConfig( KConfig* conf, TQWidget* parent )
this, TQT_SLOT(slotSelectionChanged()) );
// Create the theme directory (if not found) ... and obtain the path as we do so.
- localThemeString = KGlobal::dirs()->saveLocation("data", "twin");
+ localThemeString = TDEGlobal::dirs()->saveLocation("data", "twin");
localThemeString += "/icewm-themes";
if (!TQFile::exists(localThemeString))
TQDir().mkdir(localThemeString);
@@ -158,7 +158,7 @@ IceWMConfig::~IceWMConfig()
// Searches for all installed IceWM themes, and adds them to the listBox.
void IceWMConfig::findIceWMThemes()
{
- TQStringList dirList = KGlobal::dirs()->findDirs("data", "twin/icewm-themes");
+ TQStringList dirList = TDEGlobal::dirs()->findDirs("data", "twin/icewm-themes");
TQStringList::ConstIterator it;
// Remove any old themes in the list (if any)
diff --git a/twin-styles/smooth-blend/client/config/smoothblendconfig.cc b/twin-styles/smooth-blend/client/config/smoothblendconfig.cc
index f2ec3e68..a59e1c46 100644
--- a/twin-styles/smooth-blend/client/config/smoothblendconfig.cc
+++ b/twin-styles/smooth-blend/client/config/smoothblendconfig.cc
@@ -30,7 +30,7 @@ smoothblendConfig::smoothblendConfig(KConfig* config, TQWidget* parent)
: TQObject(parent), config_(0), dialog_(0) {
// create the configuration object
config_ = new KConfig("twinsmoothblendrc");
- KGlobal::locale()->insertCatalogue("twin_smoothblend_config");
+ TDEGlobal::locale()->insertCatalogue("twin_smoothblend_config");
// create and show the configuration dialog
dialog_ = new ConfigDialog(parent);