summaryrefslogtreecommitdiffstats
path: root/kstyles
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:47:22 -0600
commit28edc0aa2ab09297288186f5bc15765eb7be58c0 (patch)
tree7b7a01768b3781763186c825af21bb14717d2c32 /kstyles
parent07c48c43ff72c237e4028154f4594102b798073f (diff)
downloadtdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.tar.gz
tdelibs-28edc0aa2ab09297288186f5bc15765eb7be58c0.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kstyles')
-rw-r--r--kstyles/highcontrast/config/highcontrastconfig.cpp4
-rw-r--r--kstyles/klegacy/klegacystyle.cpp2
-rw-r--r--kstyles/plastik/config/plastikconf.cpp4
-rw-r--r--kstyles/utils/installtheme/main.cpp6
4 files changed, 8 insertions, 8 deletions
diff --git a/kstyles/highcontrast/config/highcontrastconfig.cpp b/kstyles/highcontrast/config/highcontrastconfig.cpp
index 233fb7365..9de7f1bfd 100644
--- a/kstyles/highcontrast/config/highcontrastconfig.cpp
+++ b/kstyles/highcontrast/config/highcontrastconfig.cpp
@@ -44,7 +44,7 @@ HighContrastStyleConfig::HighContrastStyleConfig(
{
// Should have no margins here, the dialog provides them
TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0);
- KGlobal::locale()->insertCatalogue("kstyle_highcontrast_config");
+ TDEGlobal::locale()->insertCatalogue("kstyle_highcontrast_config");
wideLinesBox = new TQCheckBox(i18n("Use wider lines"), this);
@@ -62,7 +62,7 @@ HighContrastStyleConfig::HighContrastStyleConfig(
HighContrastStyleConfig::~HighContrastStyleConfig()
{
- KGlobal::locale()->removeCatalogue("kstyle_keramik_config");
+ TDEGlobal::locale()->removeCatalogue("kstyle_keramik_config");
}
diff --git a/kstyles/klegacy/klegacystyle.cpp b/kstyles/klegacy/klegacystyle.cpp
index 7be529840..bd1deffb8 100644
--- a/kstyles/klegacy/klegacystyle.cpp
+++ b/kstyles/klegacy/klegacystyle.cpp
@@ -3040,7 +3040,7 @@ void KLegacyStyle::drawKickerTaskButton(TQPainter *p, int x, int y, int w, int h
TQString s(title);
- static const TQString &modStr = KGlobal::staticQString(
+ static const TQString &modStr = TDEGlobal::staticQString(
TQString::fromUtf8("[") + i18n("modified") + TQString::fromUtf8("]"));
int modStrPos = s.find(modStr);
diff --git a/kstyles/plastik/config/plastikconf.cpp b/kstyles/plastik/config/plastikconf.cpp
index 70d4f6cfa..338cdcd1e 100644
--- a/kstyles/plastik/config/plastikconf.cpp
+++ b/kstyles/plastik/config/plastikconf.cpp
@@ -41,7 +41,7 @@ extern "C"
{
KDE_EXPORT TQWidget* allocate_kstyle_config(TQWidget* parent)
{
- KGlobal::locale()->insertCatalogue("kstyle_plastik_config");
+ TDEGlobal::locale()->insertCatalogue("kstyle_plastik_config");
return new PlastikStyleConfig(parent);
}
}
@@ -50,7 +50,7 @@ PlastikStyleConfig::PlastikStyleConfig(TQWidget* parent): TQWidget(parent)
{
//Should have no margins here, the dialog provides them
TQVBoxLayout* layout = new TQVBoxLayout(this, 0, 0);
- KGlobal::locale()->insertCatalogue("kstyle_plastik_config");
+ TDEGlobal::locale()->insertCatalogue("kstyle_plastik_config");
// scrollBarLines = new TQCheckBox(i18n("Scrollbar handle lines"), this);
animateProgressBar = new TQCheckBox(i18n("Animate progress bars"), this);
diff --git a/kstyles/utils/installtheme/main.cpp b/kstyles/utils/installtheme/main.cpp
index e6ffce721..67e29f706 100644
--- a/kstyles/utils/installtheme/main.cpp
+++ b/kstyles/utils/installtheme/main.cpp
@@ -40,8 +40,8 @@ int main(int argc, char **argv)
TDECmdLineArgs::init(argc, argv, "kinstalltheme", I18N_NOOP("KInstalltheme"), desc, ver);
TDEApplication qapp(false, false); //We don't allow styles.. Kind of ironic, isn't it?
- KGlobal::dirs()->addResourceType("themercs", KGlobal::dirs()->kde_default("data")+TQString("kstyle/themes"));
- TQStringList themercs = KGlobal::dirs()->findAllResources("themercs","*.themerc");
+ TDEGlobal::dirs()->addResourceType("themercs", TDEGlobal::dirs()->kde_default("data")+TQString("kstyle/themes"));
+ TQStringList themercs = TDEGlobal::dirs()->findAllResources("themercs","*.themerc");
TQMap <TQString, TQString> themes; //Name->file mapping..
@@ -62,7 +62,7 @@ int main(int argc, char **argv)
}
}
- KSimpleConfig cache( KGlobal::dirs()->saveLocation("config")+"kthemestylerc");
+ KSimpleConfig cache( TDEGlobal::dirs()->saveLocation("config")+"kthemestylerc");
#if 0
//Doesn't seem to work with present Qt..