summaryrefslogtreecommitdiffstats
path: root/kpersonalizer
diff options
context:
space:
mode:
Diffstat (limited to 'kpersonalizer')
-rw-r--r--kpersonalizer/kcountrypage.cpp24
-rw-r--r--kpersonalizer/keyecandypage.cpp22
-rw-r--r--kpersonalizer/keyecandypagedlg.ui4
-rw-r--r--kpersonalizer/kfindlanguage.cpp8
-rw-r--r--kpersonalizer/kospage.cpp14
-rw-r--r--kpersonalizer/kospagedlg.ui4
-rw-r--r--kpersonalizer/kpersonalizer.cpp22
-rw-r--r--kpersonalizer/krefinepage.cpp2
-rw-r--r--kpersonalizer/main.cpp4
-rwxr-xr-x[-rw-r--r--]kpersonalizer/pics/step1.pngbin55312 -> 77883 bytes
-rwxr-xr-x[-rw-r--r--]kpersonalizer/pics/step2.pngbin65197 -> 75829 bytes
-rwxr-xr-x[-rw-r--r--]kpersonalizer/pics/step3.pngbin73388 -> 85316 bytes
-rwxr-xr-x[-rw-r--r--]kpersonalizer/pics/step4.pngbin56070 -> 61007 bytes
-rwxr-xr-x[-rw-r--r--]kpersonalizer/pics/step5.pngbin72763 -> 85871 bytes
-rw-r--r--kpersonalizer/stylepreview.ui4
-rw-r--r--kpersonalizer/stylepreview.ui.h4
-rw-r--r--kpersonalizer/tdestylepage.cpp34
17 files changed, 73 insertions, 73 deletions
diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp
index cec71bae8..6a9961de3 100644
--- a/kpersonalizer/kcountrypage.cpp
+++ b/kpersonalizer/kcountrypage.cpp
@@ -20,13 +20,13 @@
#include <tqmap.h>
#include <tdeapplication.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <tdelocale.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kiconloader.h>
#include <dcopclient.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <klanguagebutton.h>
#include "kfindlanguage.h"
@@ -37,8 +37,8 @@ KCountryPage::KCountryPage(TQWidget *parent, const char *name ) : KCountryPageDl
px_introSidebar->setPixmap(UserIcon("step1.png"));
- connect(cb_country, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(setLangForCountry(const TQString &)));
- connect(cb_language, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(setLanguageChanged()));
+ connect(cb_country, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(setLangForCountry(const TQString &)));
+ connect(cb_language, TQ_SIGNAL(activated(const TQString &)), TQ_SLOT(setLanguageChanged()));
// naturally, the language is not changed on startup
b_savedLanguageChanged = false;
@@ -85,7 +85,7 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) {
TQMap<TQString,TQString> regionnames;
for ( TQStringList::ConstIterator it = regionfiles.begin(); it != regionfiles.end(); ++it ) {
- KSimpleConfig entry(*it);
+ TDESimpleConfig entry(*it);
entry.setGroup(TQString::fromLatin1("KCM Locale"));
TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
@@ -112,7 +112,7 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) {
countrylist.sort();
for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) {
- KSimpleConfig entry(*it);
+ TDESimpleConfig entry(*it);
entry.setGroup(TQString::fromLatin1("KCM Locale"));
TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
TQString submenu = '-' + entry.readEntry("Region");
@@ -163,25 +163,25 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan
TQByteArray data, da;
TQDataStream stream( data, IO_WriteOnly );
stream << comboLang->current();
- if ( !kapp->dcopClient()->isAttached() )
- kapp->dcopClient()->attach();
+ if ( !tdeApp->dcopClient()->isAttached() )
+ tdeApp->dcopClient()->attach();
// tdesycoca needs to be rebuilt
TDEProcess proc;
proc << TQString::fromLatin1("tdebuildsycoca");
proc.start(TDEProcess::DontCare);
kdDebug() << "TDELocaleConfig::save : sending signal to kdesktop" << endl;
// inform kicker and kdeskop about the new language
- kapp->dcopClient()->send( "kicker", "Panel", "restart()", TQString::null);
+ tdeApp->dcopClient()->send( "kicker", "Panel", "restart()", TQString::null);
// call, not send, so that we know it's done before coming back
// (we both access kdeglobals...)
- kapp->dcopClient()->call( "kdesktop", "KDesktopIface", "languageChanged(TQString)", data, replyType, replyData );
+ tdeApp->dcopClient()->call( "kdesktop", "KDesktopIface", "languageChanged(TQString)", data, replyType, replyData );
}
// KPersonalizer::next() probably waits for a return-value
return true;
}
void KCountryPage::setLangForCountry(const TQString &country) {
- KSimpleConfig ent(locate("locale", "l10n/" + country + "/entry.desktop"), true);
+ TDESimpleConfig ent(locate("locale", "l10n/" + country + "/entry.desktop"), true);
ent.setGroup(TQString::fromLatin1("KCM Locale"));
langs = ent.readListEntry(TQString::fromLatin1("Languages"));
diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp
index 9c1fb7765..25855e871 100644
--- a/kpersonalizer/keyecandypage.cpp
+++ b/kpersonalizer/keyecandypage.cpp
@@ -24,9 +24,9 @@
#include <tqsettings.h>
#include <tqfont.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <dcopclient.h>
#include <kipc.h>
@@ -416,7 +416,7 @@ void KEyeCandyPage::enableIconEffectSizePanel(bool enable){
else
stream << panelsize;
- kapp->dcopClient()->send( "kicker", "Panel", "setPanelSize(int)",data);
+ tdeApp->dcopClient()->send( "kicker", "Panel", "setPanelSize(int)",data);
}
/** No descriptions */
@@ -623,13 +623,13 @@ void KEyeCandyPage::save(bool currSettings){
kdesktopconf->sync();
TDEGlobal::config()->sync();
// restart twin for window effects
- kapp->dcopClient()->send("knotify", "Notify", "reconfigure()", TQString(""));
- kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+ tdeApp->dcopClient()->send("knotify", "Notify", "reconfigure()", TQString(""));
+ tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
// set the display options (style effects)
KIPC::sendMessageAll(KIPC::SettingsChanged);
TQApplication::syncX();
// kicker stuff: Iconzooming etc.
- kapp->dcopClient()->send( "kicker", "Panel", "configure()", TQString("") );
+ tdeApp->dcopClient()->send( "kicker", "Panel", "configure()", TQString("") );
// Icon stuff
for (int i=0; i<TDEIcon::LastGroup; i++) {
KIPC::sendMessageAll(KIPC::IconChanged, i);
@@ -637,10 +637,10 @@ void KEyeCandyPage::save(bool currSettings){
// font stuff
KIPC::sendMessageAll(KIPC::FontChanged);
// unfortunately, the konqiconview does not re-read the configuration to restructure the previews and the background picture
- kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", TQString("") );
- kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", TQString("") );
- kapp->dcopClient()->send( "kdesktop", "KBackgroundIface", "configure()", TQString("") );
- kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "lineupIcons()", TQString("") );
+ tdeApp->dcopClient()->send( "konqueror*", "KonquerorIface", "reparseConfiguration()", TQString("") );
+ tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", TQString("") );
+ tdeApp->dcopClient()->send( "kdesktop", "KBackgroundIface", "configure()", TQString("") );
+ tdeApp->dcopClient()->send( "kdesktop", "KDesktopIface", "lineupIcons()", TQString("") );
}
void KEyeCandyPage::slotEyeCandyShowDetails(bool details){
@@ -677,7 +677,7 @@ void KEyeCandyPage::getUserDefaults(){
TQByteArray replydata;
TQByteArray data;
TQCString replytype;
- kapp->dcopClient()->call( "kicker", "Panel", "panelSize()",data, replytype, replydata);
+ tdeApp->dcopClient()->call( "kicker", "Panel", "panelSize()",data, replytype, replydata);
TQDataStream stream( replydata, IO_ReadOnly );
stream >> panelsize;
diff --git a/kpersonalizer/keyecandypagedlg.ui b/kpersonalizer/keyecandypagedlg.ui
index 1a9c7e570..79835faf4 100644
--- a/kpersonalizer/keyecandypagedlg.ui
+++ b/kpersonalizer/keyecandypagedlg.ui
@@ -251,10 +251,10 @@ If you have a fast, new processor, you might want to turn them all on, but for t
<slot>slotEyeCandySliderMoved(int)</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot>slotEyeCandyShowDetails(bool)</slot>
<slot>slotEyeCandySliderMoved(int)</slot>
-</Q_SLOTS>
+</slots>
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
<include location="global" impldecl="in implementation">tdelistview.h</include>
diff --git a/kpersonalizer/kfindlanguage.cpp b/kpersonalizer/kfindlanguage.cpp
index 150c67b28..bcf1f83ad 100644
--- a/kpersonalizer/kfindlanguage.cpp
+++ b/kpersonalizer/kfindlanguage.cpp
@@ -21,9 +21,9 @@
#include <tqstringlist.h>
#include <tqmap.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include "kfindlanguage.h"
@@ -54,7 +54,7 @@ KFindLanguage::KFindLanguage() {
}
// get the users primary Languages
- KSimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop").arg(m_country)), true);
+ TDESimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop").arg(m_country)), true);
ent.setGroup("KCM Locale");
TQStringList langs = ent.readListEntry("Languages");
if (langs.isEmpty())
@@ -77,7 +77,7 @@ KFindLanguage::KFindLanguage() {
langlist += alllang;
for ( TQStringList::ConstIterator it = langlist.begin(); it != langlist.end(); ++it ) {
- KSimpleConfig entry(*it);
+ TDESimpleConfig entry(*it);
entry.setGroup("KCM Locale");
TQString name = entry.readEntry("Name", i18n("without name"));
diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp
index 017b95fe7..885519a61 100644
--- a/kpersonalizer/kospage.cpp
+++ b/kpersonalizer/kospage.cpp
@@ -21,8 +21,8 @@
#include <tqtextview.h>
#include <tqmap.h>
-#include <ksimpleconfig.h>
-#include <kstandarddirs.h>
+#include <tdesimpleconfig.h>
+#include <tdestandarddirs.h>
#include <tdeapplication.h>
#include <tdelocale.h>
#include <dcopclient.h>
@@ -90,14 +90,14 @@ void KOSPage::save(bool currSettings){
TQApplication::syncX();
// enable/disable the mac menu, call dcop
// Tell kdesktop about the new config file
- kapp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", TQByteArray());
+ tdeApp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", TQByteArray());
///////////////////////////////////////////
/// restart twin for window effects
- kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+ tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
///////////////////////////////////////////
// Make the kaccess daemon read the changed config file
- kapp->startServiceByDesktopName("kaccess");
+ tdeApp->startServiceByDesktopName("kaccess");
}
@@ -309,9 +309,9 @@ void KOSPage::writeKeyEntrys(TQString keyfile){
kdDebug() << "KOSPage::writeKeyEntrys()" << endl;
// load the given .kksrc - file
- KSimpleConfig* scheme = new KSimpleConfig(keyfile, true);
+ TDESimpleConfig* scheme = new TDESimpleConfig(keyfile, true);
// load the default .kksrc - file
- KSimpleConfig* defScheme = new KSimpleConfig(locate("keys", "trinity.kksrc"), true);
+ TDESimpleConfig* defScheme = new TDESimpleConfig(locate("keys", "trinity.kksrc"), true);
// we need the entries from the default - file, so we can compare with them
TQMap<TQString, TQString> defMap = defScheme->entryMap("Global Shortcuts");
diff --git a/kpersonalizer/kospagedlg.ui b/kpersonalizer/kospagedlg.ui
index 30edfeea9..45e2de8b5 100644
--- a/kpersonalizer/kospagedlg.ui
+++ b/kpersonalizer/kospagedlg.ui
@@ -207,12 +207,12 @@ Trinity allows you to customize its behavior according to your needs.</string>
<slot>slotMacDescription()</slot>
</connection>
</connections>
-<Q_SLOTS>
+<slots>
<slot>slotWindowsDescription()</slot>
<slot>slotKDEDescription()</slot>
<slot>slotMacDescription()</slot>
<slot>slotUnixDescription()</slot>
-</Q_SLOTS>
+</slots>
<includes>
<include location="local" impldecl="in implementation">kdialog.h</include>
</includes>
diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp
index 86b0a5b4a..c42276845 100644
--- a/kpersonalizer/kpersonalizer.cpp
+++ b/kpersonalizer/kpersonalizer.cpp
@@ -25,10 +25,10 @@
#include <tqtimer.h>
#include <tqcursor.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <tdeglobal.h>
#include <tdeglobalsettings.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdelocale.h>
#include <tdeapplication.h>
#include <tdelistview.h>
@@ -57,11 +57,11 @@ KPersonalizer::KPersonalizer(TQWidget *parent, const char *name)
: KWizard(parent, name, true) {
// first, reset the startup from true (see desktop file in share/autostart) to false
- setCaption(kapp->caption());
- kapp->config()->setGroup("General");
+ setCaption(tdeApp->caption());
+ tdeApp->config()->setGroup("General");
os_dirty = eye_dirty = style_dirty=false;
- kapp->config()->writeEntry("FirstLogin", false);
- kapp->config()->sync();
+ tdeApp->config()->writeEntry("FirstLogin", false);
+ tdeApp->config()->sync();
countrypage= new KCountryPage(this);
addPage( countrypage, i18n( "Step 1: Introduction" ) );
@@ -90,9 +90,9 @@ KPersonalizer::KPersonalizer(TQWidget *parent, const char *name)
locale = new TDELocale("kpersonalizer");
locale->setLanguage(TDELocale::defaultLanguage());
- connect(ospage, TQT_SIGNAL(selectedOS(const TQString&)), stylepage, TQT_SLOT(presetStyle(const TQString&)));
- connect(ospage, TQT_SIGNAL(selectedOS(const TQString&)), eyecandy, TQT_SLOT(slotPresetSlider(const TQString&)));
- connect(refinepage->pb_kcontrol, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()));
+ connect(ospage, TQ_SIGNAL(selectedOS(const TQString&)), stylepage, TQ_SLOT(presetStyle(const TQString&)));
+ connect(ospage, TQ_SIGNAL(selectedOS(const TQString&)), eyecandy, TQ_SLOT(slotPresetSlider(const TQString&)));
+ connect(refinepage->pb_kcontrol, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()));
setPosition();
@@ -125,7 +125,7 @@ void KPersonalizer::next() {
else if(currentPage()==eyecandy){
eye_dirty=true; // set the dirty flag, changes done that need reverting
eyecandy->save();
- TQTimer::singleShot(0, this, TQT_SLOT(slotNext()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotNext()));
}
else if(currentPage()==stylepage){
style_dirty=true; // set the dirty flag, changes done that need reverting
@@ -215,7 +215,7 @@ void KPersonalizer::slotRestart() {
}
void KPersonalizer::delayedRestart() {
- TQTimer::singleShot(0, this, TQT_SLOT(slotRestart()));
+ TQTimer::singleShot(0, this, TQ_SLOT(slotRestart()));
}
/** this session is restarted, so we want to start with ospage */
diff --git a/kpersonalizer/krefinepage.cpp b/kpersonalizer/krefinepage.cpp
index 568967690..32c7370ae 100644
--- a/kpersonalizer/krefinepage.cpp
+++ b/kpersonalizer/krefinepage.cpp
@@ -28,7 +28,7 @@
KRefinePage::KRefinePage(TQWidget *parent, const char *name ) : KRefinePageDlg(parent,name) {
px_finishSidebar->setPixmap(UserIcon("step5.png"));
- connect( pb_kcontrol, TQT_SIGNAL(clicked()), TQT_SLOT(startKControl()) );
+ connect( pb_kcontrol, TQ_SIGNAL(clicked()), TQ_SLOT(startKControl()) );
if( KPersonalizer::beforeSession()) {
pb_kcontrol->hide();
lb_kcontrol->hide();
diff --git a/kpersonalizer/main.cpp b/kpersonalizer/main.cpp
index e03c19038..7c83315c1 100644
--- a/kpersonalizer/main.cpp
+++ b/kpersonalizer/main.cpp
@@ -48,8 +48,8 @@ int main(int argc, char *argv[])
TDELocale::setMainCatalogue("kpersonalizer");
TDEApplication a;
- if ( !kapp->dcopClient()->isAttached() )
- kapp->dcopClient()->attach();
+ if ( !tdeApp->dcopClient()->isAttached() )
+ tdeApp->dcopClient()->attach();
TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
diff --git a/kpersonalizer/pics/step1.png b/kpersonalizer/pics/step1.png
index 63a2eec66..442c54af0 100644..100755
--- a/kpersonalizer/pics/step1.png
+++ b/kpersonalizer/pics/step1.png
Binary files differ
diff --git a/kpersonalizer/pics/step2.png b/kpersonalizer/pics/step2.png
index a0320cd67..8af43de38 100644..100755
--- a/kpersonalizer/pics/step2.png
+++ b/kpersonalizer/pics/step2.png
Binary files differ
diff --git a/kpersonalizer/pics/step3.png b/kpersonalizer/pics/step3.png
index ac9031dec..47f690668 100644..100755
--- a/kpersonalizer/pics/step3.png
+++ b/kpersonalizer/pics/step3.png
Binary files differ
diff --git a/kpersonalizer/pics/step4.png b/kpersonalizer/pics/step4.png
index 364dffc70..ea939c358 100644..100755
--- a/kpersonalizer/pics/step4.png
+++ b/kpersonalizer/pics/step4.png
Binary files differ
diff --git a/kpersonalizer/pics/step5.png b/kpersonalizer/pics/step5.png
index e6b6e790a..4ea33023f 100644..100755
--- a/kpersonalizer/pics/step5.png
+++ b/kpersonalizer/pics/step5.png
Binary files differ
diff --git a/kpersonalizer/stylepreview.ui b/kpersonalizer/stylepreview.ui
index 7e132c4c7..628241ac7 100644
--- a/kpersonalizer/stylepreview.ui
+++ b/kpersonalizer/stylepreview.ui
@@ -176,10 +176,10 @@
<include location="local" impldecl="in implementation">stylepreview.ui.h</include>
<include location="local" impldecl="in implementation">kdialog.h</include>
</includes>
-<Q_SLOTS>
+<slots>
<slot>init()</slot>
<slot returnType="bool">eventFilter( TQObject * obj, TQEvent * ev )</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="3" margin="6"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
diff --git a/kpersonalizer/stylepreview.ui.h b/kpersonalizer/stylepreview.ui.h
index b4c626221..5384edd04 100644
--- a/kpersonalizer/stylepreview.ui.h
+++ b/kpersonalizer/stylepreview.ui.h
@@ -67,9 +67,9 @@ bool StylePreview::eventFilter( TQObject* /* obj */, TQEvent* ev )
case TQEvent::Leave:
case TQEvent::Wheel:
case TQEvent::ContextMenu:
- return TRUE; // ignore
+ return true; // ignore
default:
break;
}
- return FALSE;
+ return false;
}
diff --git a/kpersonalizer/tdestylepage.cpp b/kpersonalizer/tdestylepage.cpp
index 5c85f402c..db26b343a 100644
--- a/kpersonalizer/tdestylepage.cpp
+++ b/kpersonalizer/tdestylepage.cpp
@@ -26,15 +26,15 @@
#include <tqobjectlist.h>
#include <tdeconfig.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeapplication.h>
#include <tdeglobal.h>
#include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
#include <tdelocale.h>
#include <tdelistview.h>
#include <kipc.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <dcopclient.h>
#include <tdestyle.h>
#include <kicontheme.h>
@@ -75,8 +75,8 @@ TDEStylePage::TDEStylePage(TQWidget *parent, const char *name ) : TDEStylePageDl
platinum->setText( 0, i18n( "Platinum" ) );
platinum->setText( 1, i18n( "The platinum style" ) );
- connect(klv_styles, TQT_SIGNAL(selectionChanged()),
- this, TQT_SLOT(slotCurrentChanged()));
+ connect(klv_styles, TQ_SIGNAL(selectionChanged()),
+ this, TQ_SLOT(slotCurrentChanged()));
// Note: if the default is changed here it needs to be changed in tdebase/twin/plugins.cpp
// and tdebase/twin/kcmtwin/twindecoration/twindecoration.cpp as well.
@@ -117,21 +117,21 @@ void TDEStylePage::saveStyle(bool curSettings){
void TDEStylePage::saveKWin(bool curSettings){
TQString twin = origKWinStyle;
if(curSettings) {
- KDesktopFile* kdf = 0L;
+ TDEDesktopFile* kdf = 0L;
TDEStandardDirs* kstd = TDEGlobal::dirs();
if (cde->isSelected() && twin_cde_exist)
- kdf = new KDesktopFile(kstd->findResource("data", "twin/cde.desktop"));
+ kdf = new TDEDesktopFile(kstd->findResource("data", "twin/cde.desktop"));
else if (win->isSelected() && twin_win_exist)
- kdf = new KDesktopFile(kstd->findResource("data", "twin/redmond.desktop"));
+ kdf = new TDEDesktopFile(kstd->findResource("data", "twin/redmond.desktop"));
else if (platinum->isSelected() && twin_system_exist)
- kdf = new KDesktopFile(kstd->findResource("data", "twin/system.desktop"));
+ kdf = new TDEDesktopFile(kstd->findResource("data", "twin/system.desktop"));
else if (keramik->isSelected() && twin_keramik_exist)
- kdf = new KDesktopFile(kstd->findResource("data", "twin/keramik.desktop"));
+ kdf = new TDEDesktopFile(kstd->findResource("data", "twin/keramik.desktop"));
else if (kde->isSelected()) {
if (twin_plastik_exist && (TQColor::numBitPlanes() > 8))
- kdf = new KDesktopFile(kstd->findResource("data", "twin/plastik.desktop"));
+ kdf = new TDEDesktopFile(kstd->findResource("data", "twin/plastik.desktop"));
else if (twin_quartz_exist)
- kdf = new KDesktopFile(kstd->findResource("data", "twin/quartz.desktop"));
+ kdf = new TDEDesktopFile(kstd->findResource("data", "twin/quartz.desktop"));
}
if (kdf) {
@@ -187,8 +187,8 @@ void TDEStylePage::saveColors(bool curSettings){
////////////////////////////////////////////////////
// KDE-1.x support
- KSimpleConfig *tdeconfig =
- new KSimpleConfig( TQDir::homeDirPath() + "/.tderc" );
+ TDESimpleConfig *tdeconfig =
+ new TDESimpleConfig( TQDir::homeDirPath() + "/.tderc" );
tdeconfig->setGroup( "General" );
tdeconfig->writeEntry("background", toSave->background );
tdeconfig->writeEntry("selectBackground", toSave->selectBackground );
@@ -363,7 +363,7 @@ void TDEStylePage::getColors(colorSet *set, bool colorfile ){
set->colorFile=locate("colors","EveX.kcsrc");
}
set->contrast=7;
- config = new KSimpleConfig(set->colorFile, true);
+ config = new TDESimpleConfig(set->colorFile, true);
config->setGroup("Color Scheme");
kdDebug() << "TDEStylePage::getColors(): schemefile: " << set->colorFile << endl;
deleteConfig = true;
@@ -522,9 +522,9 @@ void TDEStylePage::liveUpdate() {
// color palette changes
KIPC::sendMessageAll(KIPC::PaletteChanged);
// twin-style
- kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
+ tdeApp->dcopClient()->send("twin*", "", "reconfigure()", TQString(""));
// kdesktop-background
- kapp->dcopClient()->send("kdesktop", "KBackgroundIface", "configure()", TQString(""));
+ tdeApp->dcopClient()->send("kdesktop", "KBackgroundIface", "configure()", TQString(""));
}
/** show the previewWidget styled with the selected one */