summaryrefslogtreecommitdiffstats
path: root/kpersonalizer
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-19 01:42:14 +0000
commit8155225c9be993acc0512956416d195edfef4eb9 (patch)
treede4f3cd17614fc67e47eefabcdbe2fbe170c9be7 /kpersonalizer
parent364641b8e0279758d236af39abd138d379328a19 (diff)
downloadtdebase-8155225c9be993acc0512956416d195edfef4eb9.tar.gz
tdebase-8155225c9be993acc0512956416d195edfef4eb9.zip
Enable compilation with TQt for Qt4 3.4.0 TP2
This should not break compatibility with TQt for Qt3; if it does please fix it ASAP! git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1215552 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kpersonalizer')
-rw-r--r--kpersonalizer/kcountrypage.cpp36
-rw-r--r--kpersonalizer/kcountrypagedlg.ui26
-rw-r--r--kpersonalizer/keyecandypage.cpp14
-rw-r--r--kpersonalizer/keyecandypagedlg.ui28
-rw-r--r--kpersonalizer/kfindlanguage.cpp28
-rw-r--r--kpersonalizer/kospage.cpp2
-rw-r--r--kpersonalizer/kospage.h2
-rw-r--r--kpersonalizer/kospagedlg.ui32
-rw-r--r--kpersonalizer/kpersonalizer.cpp10
-rw-r--r--kpersonalizer/krefinepagedlg.ui36
-rw-r--r--kpersonalizer/kstylepage.cpp14
-rw-r--r--kpersonalizer/kstylepagedlg.ui12
-rw-r--r--kpersonalizer/ksysinfo.cpp32
-rw-r--r--kpersonalizer/stylepreview.ui36
-rw-r--r--kpersonalizer/stylepreview.ui.h2
15 files changed, 155 insertions, 155 deletions
diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp
index 4e30c736..d7e286c1 100644
--- a/kpersonalizer/kcountrypage.cpp
+++ b/kpersonalizer/kcountrypage.cpp
@@ -76,7 +76,7 @@ KCountryPage::~KCountryPage(){
void KCountryPage::loadCountryList(KLanguageButton *combo) {
- TQString sub = TQString::fromLatin1("l10n/");
+ TQString sub = TQString::tqfromLatin1("l10n/");
// clear the list
combo->clear();
@@ -86,17 +86,17 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) {
for ( TQStringList::ConstIterator it = regionfiles.begin(); it != regionfiles.end(); ++it ) {
KSimpleConfig entry(*it);
- entry.setGroup(TQString::fromLatin1("KCM Locale"));
- TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
+ entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
+ TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
TQString tag = *it;
int index;
- index = tag.findRev('/');
+ index = tag.tqfindRev('/');
if (index != -1)
tag = tag.mid(index + 1);
- index = tag.findRev('.');
+ index = tag.tqfindRev('.');
if (index != -1)
tag.truncate(index);
@@ -113,17 +113,17 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) {
for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) {
KSimpleConfig entry(*it);
- entry.setGroup(TQString::fromLatin1("KCM Locale"));
- TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name"));
+ entry.setGroup(TQString::tqfromLatin1("KCM Locale"));
+ TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name"));
TQString submenu = '-' + entry.readEntry("Region");
TQString tag = *it;
- int index = tag.findRev('/');
+ int index = tag.tqfindRev('/');
tag.truncate(index);
- index = tag.findRev('/');
+ index = tag.tqfindRev('/');
tag = tag.mid(index+1);
- TQPixmap flag( locate( "locale", TQString::fromLatin1("l10n/%1/flag.png").arg(tag) ) );
+ TQPixmap flag( locate( "locale", TQString::tqfromLatin1("l10n/%1/flag.png").arg(tag) ) );
TQIconSet icon( flag );
combo->insertItem( icon, name, tag, submenu );
}
@@ -138,7 +138,7 @@ void KCountryPage::fillLanguageMenu(KLanguageButton *combo) {
for ( it = langlist.begin(); it != langlist.end(); ++it ) {
if ((*it).isNull()) {
combo->insertSeparator();
- submenu = TQString::fromLatin1("all");
+ submenu = TQString::tqfromLatin1("all");
combo->insertSubmenu(i18n("All"), submenu, TQString::null);
continue;
}
@@ -151,9 +151,9 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan
kdDebug() << "KCountryPage::save()" << endl;
KConfigBase *config = KGlobal::config();
- config->setGroup(TQString::fromLatin1("Locale"));
- config->writeEntry(TQString::fromLatin1("Country"), comboCountry->current(), true, true);
- config->writeEntry(TQString::fromLatin1("Language"), comboLang->current(), true, true);
+ config->setGroup(TQString::tqfromLatin1("Locale"));
+ config->writeEntry(TQString::tqfromLatin1("Country"), comboCountry->current(), true, true);
+ config->writeEntry(TQString::tqfromLatin1("Language"), comboLang->current(), true, true);
config->sync();
// only make the system reload the language, if the selected one deferes from the old saved one.
@@ -167,7 +167,7 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan
kapp->dcopClient()->attach();
// ksycoca needs to be rebuilt
KProcess proc;
- proc << TQString::fromLatin1("kbuildsycoca");
+ proc << TQString::tqfromLatin1("kbuildsycoca");
proc.start(KProcess::DontCare);
kdDebug() << "KLocaleConfig::save : sending signal to kdesktop" << endl;
// inform kicker and kdeskop about the new language
@@ -182,10 +182,10 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan
void KCountryPage::setLangForCountry(const TQString &country) {
KSimpleConfig ent(locate("locale", "l10n/" + country + "/entry.desktop"), true);
- ent.setGroup(TQString::fromLatin1("KCM Locale"));
- langs = ent.readListEntry(TQString::fromLatin1("Languages"));
+ ent.setGroup(TQString::tqfromLatin1("KCM Locale"));
+ langs = ent.readListEntry(TQString::tqfromLatin1("Languages"));
- TQString lang = TQString::fromLatin1("en_US");
+ TQString lang = TQString::tqfromLatin1("en_US");
// use the first INSTALLED langauge in the list, or default to C
for ( TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it ) {
if (cb_language->contains(*it)) {
diff --git a/kpersonalizer/kcountrypagedlg.ui b/kpersonalizer/kcountrypagedlg.ui
index 72ab5f5c..168c0d01 100644
--- a/kpersonalizer/kcountrypagedlg.ui
+++ b/kpersonalizer/kcountrypagedlg.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>KCountryPageDlg</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>KCountryPageDlg</cstring>
</property>
@@ -16,7 +16,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget" row="6" column="1">
+ <widget class="TQLayoutWidget" row="6" column="1">
<property name="name">
<cstring>Layout6</cstring>
</property>
@@ -36,7 +36,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>150</width>
<height>0</height>
@@ -56,7 +56,7 @@
</spacer>
</hbox>
</widget>
- <widget class="QLabel" row="5" column="1">
+ <widget class="TQLabel" row="5" column="1">
<property name="name">
<cstring>TextLabel10_2</cstring>
</property>
@@ -64,7 +64,7 @@
<string>Please choose your language:</string>
</property>
</widget>
- <widget class="QLabel" row="1" column="1">
+ <widget class="TQLabel" row="1" column="1">
<property name="name">
<cstring>TextLabel6</cstring>
</property>
@@ -84,7 +84,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignTop|AlignLeft</set>
</property>
<property name="vAlign" stdset="0">
@@ -92,7 +92,7 @@
<property name="wordwrap" stdset="0">
</property>
</widget>
- <widget class="QLabel" row="0" column="1">
+ <widget class="TQLabel" row="0" column="1">
<property name="name">
<cstring>txt_welcome</cstring>
</property>
@@ -100,7 +100,7 @@
<string>&lt;h3&gt;Welcome to Trinity %VERSION%!&lt;/h3&gt;</string>
</property>
</widget>
- <widget class="QLayoutWidget" row="4" column="1">
+ <widget class="TQLayoutWidget" row="4" column="1">
<property name="name">
<cstring>Layout6_2</cstring>
</property>
@@ -120,7 +120,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>150</width>
<height>0</height>
@@ -140,7 +140,7 @@
</spacer>
</hbox>
</widget>
- <widget class="QLabel" row="3" column="1">
+ <widget class="TQLabel" row="3" column="1">
<property name="name">
<cstring>TextLabel10</cstring>
</property>
@@ -148,7 +148,7 @@
<string>Please choose your country:</string>
</property>
</widget>
- <widget class="QLabel" row="0" column="0" rowspan="9" colspan="1">
+ <widget class="TQLabel" row="0" column="0" rowspan="9" colspan="1">
<property name="name">
<cstring>px_introSidebar</cstring>
</property>
@@ -160,7 +160,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>170</width>
<height>430</height>
@@ -189,7 +189,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>30</height>
diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp
index bb76455b..ca9846cc 100644
--- a/kpersonalizer/keyecandypage.cpp
+++ b/kpersonalizer/keyecandypage.cpp
@@ -623,13 +623,13 @@ void KEyeCandyPage::save(bool currSettings){
kdesktopconf->sync();
KGlobal::config()->sync();
// restart kwin for window effects
- kapp->dcopClient()->send("knotify", "Notify", "reconfigure()", "");
- kapp->dcopClient()->send("kwin*", "", "reconfigure()", "");
+ kapp->dcopClient()->send("knotify", "Notify", "reconfigure()", TQString(""));
+ kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString(""));
// set the display options (style effects)
KIPC::sendMessageAll(KIPC::SettingsChanged);
TQApplication::syncX();
// kicker stuff: Iconzooming etc.
- kapp->dcopClient()->send( "kicker", "Panel", "configure()", "" );
+ kapp->dcopClient()->send( "kicker", "Panel", "configure()", TQString("") );
// Icon stuff
for (int i=0; i<KIcon::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()", "" );
- kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "configure()", "" );
- kapp->dcopClient()->send( "kdesktop", "KBackgroundIface", "configure()", "" );
- kapp->dcopClient()->send( "kdesktop", "KDesktopIface", "lineupIcons()", "" );
+ 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("") );
}
void KEyeCandyPage::slotEyeCandyShowDetails(bool details){
diff --git a/kpersonalizer/keyecandypagedlg.ui b/kpersonalizer/keyecandypagedlg.ui
index 4f94df4e..81baf5c8 100644
--- a/kpersonalizer/keyecandypagedlg.ui
+++ b/kpersonalizer/keyecandypagedlg.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>KEyeCandyPageDlg</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>KEyeCandyPageDlg</cstring>
</property>
@@ -16,7 +16,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="0" rowspan="6" colspan="1">
+ <widget class="TQLabel" row="0" column="0" rowspan="6" colspan="1">
<property name="name">
<cstring>px_eyecandySidebar</cstring>
</property>
@@ -28,7 +28,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>170</width>
<height>430</height>
@@ -47,7 +47,7 @@
<number>0</number>
</property>
</widget>
- <widget class="QLabel" row="0" column="1">
+ <widget class="TQLabel" row="0" column="1">
<property name="name">
<cstring>TextLabel8</cstring>
</property>
@@ -63,7 +63,7 @@
<string>&lt;P&gt;Trinity offers many visually appealing special effects, such as smoothed fonts, previews in the file manager and animated menus. All this beauty, however, comes at a small performance cost. &lt;/P&gt;
If you have a fast, new processor, you might want to turn them all on, but for those of us with slower processors, starting off with less eye candy helps to keep your desktop more responsive.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignTop|AlignLeft</set>
</property>
<property name="vAlign" stdset="0">
@@ -71,7 +71,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t
<property name="wordwrap" stdset="0">
</property>
</widget>
- <widget class="QLayoutWidget" row="1" column="1">
+ <widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
<cstring>Layout8</cstring>
</property>
@@ -79,7 +79,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>TextLabel3_2</cstring>
</property>
@@ -98,7 +98,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t
<property name="textFormat">
<enum>PlainText</enum>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">
@@ -120,7 +120,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t
<enum>Expanding</enum>
</property>
</spacer>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>Fast_2</cstring>
</property>
@@ -136,7 +136,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t
<string>Fast Processor
(more effects)</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>AlignCenter</set>
</property>
<property name="hAlign" stdset="0">
@@ -147,7 +147,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t
</widget>
</hbox>
</widget>
- <widget class="QSlider" row="2" column="1">
+ <widget class="TQSlider" row="2" column="1">
<property name="name">
<cstring>sld_effects</cstring>
</property>
@@ -167,7 +167,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t
<enum>Right</enum>
</property>
</widget>
- <widget class="QLayoutWidget" row="3" column="1">
+ <widget class="TQLayoutWidget" row="3" column="1">
<property name="name">
<cstring>Layout7</cstring>
</property>
@@ -175,7 +175,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>btn_detail</cstring>
</property>
@@ -222,7 +222,7 @@ If you have a fast, new processor, you might want to turn them all on, but for t
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>0</width>
<height>120</height>
diff --git a/kpersonalizer/kfindlanguage.cpp b/kpersonalizer/kfindlanguage.cpp
index a23f9832..61e2b193 100644
--- a/kpersonalizer/kfindlanguage.cpp
+++ b/kpersonalizer/kfindlanguage.cpp
@@ -34,19 +34,19 @@ KFindLanguage::KFindLanguage() {
m_oldlang = config->readEntry("Language");
m_oldlang = m_oldlang.lower();
- m_oldlang = m_oldlang.left(m_oldlang.find(':')); // only use the first lang
+ m_oldlang = m_oldlang.left(m_oldlang.tqfind(':')); // only use the first lang
m_country = config->readEntry("Country", "C");
if (m_country == "C") {
- m_country = TQString::fromLatin1(getenv("LANG"));
+ m_country = TQString::tqfromLatin1(getenv("LANG"));
if(m_country.left(5) == "nn_NO") // glibc's nn_NO is KDE's no_NY
m_country = "no";
- if(m_country.contains("_"))
- m_country = m_country.mid(m_country.find("_")+1);
- if(m_country.contains("."))
- m_country = m_country.left(m_country.find("."));
- if(m_country.contains("@"))
- m_country = m_country.left(m_country.find("@"));
+ if(m_country.tqcontains("_"))
+ m_country = m_country.mid(m_country.tqfind("_")+1);
+ if(m_country.tqcontains("."))
+ m_country = m_country.left(m_country.tqfind("."));
+ if(m_country.tqcontains("@"))
+ m_country = m_country.left(m_country.tqfind("@"));
if(m_country != "C")
m_country = m_country.lower();
if(m_country == "en") // special-case "en" - should be "en_GB" or "en_US", but plain "en" is in use quite often
@@ -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);
+ KSimpleConfig ent(locate("locale", TQString::tqfromLatin1("l10n/%1/entry.desktop").arg(m_country)), true);
ent.setGroup("KCM Locale");
TQStringList langs = ent.readListEntry("Languages");
if (langs.isEmpty())
@@ -82,9 +82,9 @@ KFindLanguage::KFindLanguage() {
TQString name = entry.readEntry("Name", i18n("without name"));
TQString tag = *it;
- int index = tag.findRev('/');
+ int index = tag.tqfindRev('/');
tag = tag.left(index);
- index = tag.findRev('/');
+ index = tag.tqfindRev('/');
tag = tag.mid(index+1);
m_langlist << tag;
@@ -96,7 +96,7 @@ KFindLanguage::KFindLanguage() {
if (m_oldlang.isEmpty()) {
compare = langs.first();
for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it) {
- if (*it == TQString::fromLatin1(getenv("LANG")).mid(3, 2).lower())
+ if (*it == TQString::tqfromLatin1(getenv("LANG")).mid(3, 2).lower())
compare = *it;
}
}
@@ -109,10 +109,10 @@ KFindLanguage::KFindLanguage() {
TQStringList::ConstIterator it;
for( it = m_langlist.begin(); it != m_langlist.end(); ++it) {
int match=0;
- TQString l = (*it).left((*it).find(";"));
+ TQString l = (*it).left((*it).tqfind(";"));
if (l == "C")
match++;
- if(l.contains(compare))
+ if(l.tqcontains(compare))
match+=2;
if(l.left(compare.length()) == compare)
match+=10;
diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp
index 3d92f2f4..7706331f 100644
--- a/kpersonalizer/kospage.cpp
+++ b/kpersonalizer/kospage.cpp
@@ -93,7 +93,7 @@ void KOSPage::save(bool currSettings){
kapp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", TQByteArray());
///////////////////////////////////////////
/// restart kwin for window effects
- kapp->dcopClient()->send("kwin*", "", "reconfigure()", "");
+ kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString(""));
///////////////////////////////////////////
// Make the kaccess daemon read the changed config file
diff --git a/kpersonalizer/kospage.h b/kpersonalizer/kospage.h
index b28719dc..69bd2d95 100644
--- a/kpersonalizer/kospage.h
+++ b/kpersonalizer/kospage.h
@@ -64,7 +64,7 @@ private:
// DEFAULT VALUES SET BY USER
bool b_Gestures, b_MacMenuBar, b_SingleClick, b_BusyCursor, b_ShowMenuBar,
b_DesktopUnderline, b_KonqUnderline, b_ChangeCursor, b_syncClipboards;
- QString s_TitlebarDCC, s_FocusPolicy, s_AltTabStyle, s_MMB,
+ TQString s_TitlebarDCC, s_FocusPolicy, s_AltTabStyle, s_MMB,
s_TitlebarMMB, s_TitlebarRMB;
TQMap<TQString, TQString> map_AppUserKeys, map_GlobalUserKeys;
// DEFAULT VALLUES SET BY USER (END)
diff --git a/kpersonalizer/kospagedlg.ui b/kpersonalizer/kospagedlg.ui
index e4c5fd4b..1419a11b 100644
--- a/kpersonalizer/kospagedlg.ui
+++ b/kpersonalizer/kospagedlg.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>KOSPageDlg</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>KOSPageDlg</cstring>
</property>
@@ -16,12 +16,12 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QTextView" row="4" column="1">
+ <widget class="TQTextView" row="4" column="1">
<property name="name">
<cstring>textview_ospage</cstring>
</property>
</widget>
- <widget class="QLabel" row="0" column="0" rowspan="8" colspan="1">
+ <widget class="TQLabel" row="0" column="0" rowspan="8" colspan="1">
<property name="name">
<cstring>px_osSidebar</cstring>
</property>
@@ -33,7 +33,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>170</width>
<height>430</height>
@@ -52,7 +52,7 @@
<number>0</number>
</property>
</widget>
- <widget class="QLabel" row="3" column="1">
+ <widget class="TQLabel" row="3" column="1">
<property name="name">
<cstring>TextLabel9</cstring>
</property>
@@ -60,7 +60,7 @@
<string>Description:</string>
</property>
</widget>
- <widget class="QButtonGroup" row="2" column="1">
+ <widget class="TQButtonGroup" row="2" column="1">
<property name="name">
<cstring>bg_ospage</cstring>
</property>
@@ -71,7 +71,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QRadioButton" row="0" column="0">
+ <widget class="TQRadioButton" row="0" column="0">
<property name="name">
<cstring>rb_kde</cstring>
</property>
@@ -82,7 +82,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QRadioButton" row="1" column="0">
+ <widget class="TQRadioButton" row="1" column="0">
<property name="name">
<cstring>rb_unix</cstring>
</property>
@@ -90,7 +90,7 @@
<string>UNIX (R)</string>
</property>
</widget>
- <widget class="QRadioButton" row="0" column="1">
+ <widget class="TQRadioButton" row="0" column="1">
<property name="name">
<cstring>rb_windows</cstring>
</property>
@@ -98,7 +98,7 @@
<string>Microsoft Windows (R)</string>
</property>
</widget>
- <widget class="QRadioButton" row="1" column="1">
+ <widget class="TQRadioButton" row="1" column="1">
<property name="name">
<cstring>rb_mac</cstring>
</property>
@@ -108,7 +108,7 @@
</widget>
</grid>
</widget>
- <widget class="QLabel" row="0" column="1">
+ <widget class="TQLabel" row="0" column="1">
<property name="name">
<cstring>TextLabel1</cstring>
</property>
@@ -136,7 +136,7 @@ Trinity allows you to customize its behavior according to your needs.</string>
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>22</width>
<height>10</height>
@@ -153,25 +153,25 @@ Trinity allows you to customize its behavior according to your needs.</string>
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>22</width>
<height>16</height>
</size>
</property>
</spacer>
- <widget class="QLabel" row="6" column="1">
+ <widget class="TQLabel" row="6" column="1">
<property name="name">
<cstring>TextLabel2</cstring>
</property>
<property name="text">
<string>For motion impaired users, Trinity provides keyboard gestures to activate special keyboard settings.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
- <widget class="QCheckBox" row="7" column="1">
+ <widget class="TQCheckBox" row="7" column="1">
<property name="name">
<cstring>cb_gestures</cstring>
</property>
diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp
index e28848cc..71349d2e 100644
--- a/kpersonalizer/kpersonalizer.cpp
+++ b/kpersonalizer/kpersonalizer.cpp
@@ -232,11 +232,11 @@ void KPersonalizer::setBeforeSession(){
/** there seems to be a bug in TQWizard, that makes this evil hack necessary */
void KPersonalizer::setPosition() {
- TQSize hint = countrypage->sizeHint();
- TQSize os_size = ospage->sizeHint();
- TQSize candy_size = eyecandy->sizeHint();
- TQSize style_size = stylepage->sizeHint();
- TQSize refine_size = refinepage->sizeHint();
+ TQSize hint = countrypage->tqsizeHint();
+ TQSize os_size = ospage->tqsizeHint();
+ TQSize candy_size = eyecandy->tqsizeHint();
+ TQSize style_size = stylepage->tqsizeHint();
+ TQSize refine_size = refinepage->tqsizeHint();
// get the width of the broadest child-widget
if ( hint.width() < os_size.width() )
diff --git a/kpersonalizer/krefinepagedlg.ui b/kpersonalizer/krefinepagedlg.ui
index 8d5b5835..a13e3364 100644
--- a/kpersonalizer/krefinepagedlg.ui
+++ b/kpersonalizer/krefinepagedlg.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
<class>KRefinePageDlg</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>KRefinePageDlg</cstring>
</property>
@@ -16,7 +16,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="1">
+ <widget class="TQLabel" row="0" column="1">
<property name="name">
<cstring>TextLabel11</cstring>
</property>
@@ -32,13 +32,13 @@
<string>&lt;h3&gt;Finished&lt;/h3&gt;
&lt;p&gt;After closing this dialog you can always restart this Wizard by choosing the entry &lt;b&gt;Desktop Settings Wizard&lt;/b&gt; from the Settings menu.&lt;/p&gt;</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
</property>
<property name="wordwrap" stdset="0">
</property>
</widget>
- <widget class="QFrame" row="2" column="1">
+ <widget class="TQFrame" row="2" column="1">
<property name="name">
<cstring>Frame3</cstring>
</property>
@@ -52,7 +52,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>px_kcontrol</cstring>
</property>
@@ -65,7 +65,7 @@
</sizepolicy>
</property>
</widget>
- <widget class="QLabel">
+ <widget class="TQLabel">
<property name="name">
<cstring>TextLabel1</cstring>
</property>
@@ -80,13 +80,13 @@
<property name="text">
<string>You can refine the settings you made by starting the Trinity Control Center by choosing the entry &lt;b&gt;Control Center&lt;/b&gt; in the K menu.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignTop|AlignLeft</set>
</property>
</widget>
</hbox>
</widget>
- <widget class="QLabel" row="0" column="0" rowspan="7" colspan="1">
+ <widget class="TQLabel" row="0" column="0" rowspan="7" colspan="1">
<property name="name">
<cstring>px_finishSidebar</cstring>
</property>
@@ -98,7 +98,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>170</width>
<height>430</height>
@@ -117,7 +117,7 @@
<number>0</number>
</property>
</widget>
- <widget class="QLabel" row="4" column="1">
+ <widget class="TQLabel" row="4" column="1">
<property name="name">
<cstring>lb_kcontrol</cstring>
</property>
@@ -132,7 +132,7 @@
<property name="text">
<string>You can also start the Trinity Control Center using the button below.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignCenter</set>
</property>
</widget>
@@ -146,7 +146,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>30</width>
<height>16</height>
@@ -163,14 +163,14 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>16</height>
</size>
</property>
</spacer>
- <widget class="QLayoutWidget" row="5" column="1">
+ <widget class="TQLayoutWidget" row="5" column="1">
<property name="name">
<cstring>Layout5</cstring>
</property>
@@ -188,14 +188,14 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
- <widget class="QPushButton">
+ <widget class="TQPushButton">
<property name="name">
<cstring>pb_kcontrol</cstring>
</property>
@@ -213,7 +213,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -232,7 +232,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp
index 1323d94f..04f6e49d 100644
--- a/kpersonalizer/kstylepage.cpp
+++ b/kpersonalizer/kstylepage.cpp
@@ -238,7 +238,7 @@ void KStylePage::saveIcons(bool curSettings) {
for (KIcon::Group i=KIcon::FirstGroup; i<KIcon::LastGroup; i++) {
if (groups[i] == 0L)
break;
- KGlobal::config()->setGroup(TQString::fromLatin1(groups[i]) + "Icons");
+ KGlobal::config()->setGroup(TQString::tqfromLatin1(groups[i]) + "Icons");
KGlobal::config()->writeEntry("Size", icontheme.defaultSize(i));
}
KGlobal::config()->sync();
@@ -522,9 +522,9 @@ void KStylePage::liveUpdate() {
// color palette changes
KIPC::sendMessageAll(KIPC::PaletteChanged);
// kwin-style
- kapp->dcopClient()->send("kwin*", "", "reconfigure()", "");
+ kapp->dcopClient()->send("kwin*", "", "reconfigure()", TQString(""));
// kdesktop-background
- kapp->dcopClient()->send("kdesktop", "KBackgroundIface", "configure()", "");
+ kapp->dcopClient()->send("kdesktop", "KBackgroundIface", "configure()", TQString(""));
}
/** show the previewWidget styled with the selected one */
@@ -542,7 +542,7 @@ void KStylePage::switchPrevStyle() {
// go ahead
setStyleRecursive( stylePreview, palette, style );
// this flickers, but reliably draws the widgets corretly.
- stylePreview->resize( stylePreview->sizeHint() );
+ stylePreview->resize( stylePreview->tqsizeHint() );
delete appliedStyle;
appliedStyle = style;
@@ -552,11 +552,11 @@ void KStylePage::setStyleRecursive(TQWidget* w, TQPalette &palette, TQStyle* s)
// Apply the new style.
w->setStyle(s);
// Recursively update all children.
- const TQObjectList *children = w->children();
- if (!children)
+ const TQObjectList children = w->childrenListObject();
+ if (children.isEmpty())
return;
// Apply the style to each child widget.
- TQPtrListIterator<TQObject> childit(*children);
+ TQPtrListIterator<TQObject> childit(children);
TQObject *child;
while ((child = childit.current()) != 0) {
++childit;
diff --git a/kpersonalizer/kstylepagedlg.ui b/kpersonalizer/kstylepagedlg.ui
index e32074ca..58890bb3 100644
--- a/kpersonalizer/kstylepagedlg.ui
+++ b/kpersonalizer/kstylepagedlg.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>KStylePageDlg</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>KStylePageDlg</cstring>
</property>
@@ -16,7 +16,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel" row="0" column="1">
+ <widget class="TQLabel" row="0" column="1">
<property name="name">
<cstring>TextLabel7</cstring>
</property>
@@ -31,13 +31,13 @@
<property name="text">
<string>Please choose the way your computer should look by selecting one of the items below.</string>
</property>
- <property name="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
</property>
<property name="wordwrap" stdset="0">
</property>
</widget>
- <widget class="QLabel" row="0" column="0" rowspan="4" colspan="1">
+ <widget class="TQLabel" row="0" column="0" rowspan="4" colspan="1">
<property name="name">
<cstring>px_stylesSidebar</cstring>
</property>
@@ -49,7 +49,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize">
+ <property name="tqminimumSize">
<size>
<width>170</width>
<height>430</height>
@@ -81,7 +81,7 @@
</sizepolicy>
</property>
</widget>
- <widget class="QLabel" row="2" column="1">
+ <widget class="TQLabel" row="2" column="1">
<property name="name">
<cstring>TextLabel2</cstring>
</property>
diff --git a/kpersonalizer/ksysinfo.cpp b/kpersonalizer/ksysinfo.cpp
index 20a089b8..014e6d48 100644
--- a/kpersonalizer/ksysinfo.cpp
+++ b/kpersonalizer/ksysinfo.cpp
@@ -57,9 +57,9 @@ void KSysInfo::initXInfo() {
// vendor
m_xvendor = !dpy ? TQString::null : (TQString)ServerVendor(dpy);
// XFree-Inc?
- m_xfree_inc = m_xvendor.contains("XFree86");
+ m_xfree_inc = m_xvendor.tqcontains("XFree86");
// X.org ?
- m_xorg = m_xvendor.contains("X.Org");
+ m_xorg = m_xvendor.tqcontains("X.Org");
// release-number
m_xrelease = !dpy ? 0 : VendorRelease(dpy);
// RENDER-support
@@ -99,29 +99,29 @@ bool KSysInfo::getRenderSupport(){
void KSysInfo::initFontFamilies() {
TQFontDatabase fdb;
- TQStringList families = fdb.families();
+ TQStringList families = fdb.tqfamilies();
m_normal_font = TQString::null;
m_fixed_font = TQString::null;
int normal_priority = 0, fixed_priority = 0;
for (uint i=0; i < families.count(); i++) {
TQString font = *families.at(i);
//add further NORMAL fonts here
- if ( (font.contains("Arial [") || font=="Arial") && normal_priority < 15 ) {
+ if ( (font.tqcontains("Arial [") || font=="Arial") && normal_priority < 15 ) {
m_normal_font = font;
normal_priority = 15;
- } else if ( font.contains("Vera Sans") && normal_priority < 12 ) {
+ } else if ( font.tqcontains("Vera Sans") && normal_priority < 12 ) {
m_normal_font = font;
normal_priority = 12;
- } else if ( (font.contains("Luxi Sans") || font.contains("Lucidux Sans")) && normal_priority < 10 ) {
+ } else if ( (font.tqcontains("Luxi Sans") || font.tqcontains("Lucidux Sans")) && normal_priority < 10 ) {
m_normal_font = font;
normal_priority = 10;
- } else if ( font.contains("Helmet") && normal_priority < 7 ) {
+ } else if ( font.tqcontains("Helmet") && normal_priority < 7 ) {
m_normal_font = font;
normal_priority = 7;
- } else if ( font.contains("Nimbus Sans") && normal_priority < 5 ) {
+ } else if ( font.tqcontains("Nimbus Sans") && normal_priority < 5 ) {
m_normal_font = font;
normal_priority = 5;
- } else if ( font.contains("Sans") & m_fdb->isSmoothlyScalable(font) && normal_priority < 3 ) {
+ } else if ( font.tqcontains("Sans") & m_fdb->isSmoothlyScalable(font) && normal_priority < 3 ) {
m_normal_font = font;
normal_priority = 3;
} else if ( m_fdb->isSmoothlyScalable(font) && !(m_fdb->isFixedPitch(font,"Normal") && m_fdb->isFixedPitch(font,"Bold")) && normal_priority < 2) {
@@ -132,16 +132,16 @@ void KSysInfo::initFontFamilies() {
normal_priority = 1;
}
//add further FIXED fonts here
- if (font.contains("Courier New") && fixed_priority < 15){
+ if (font.tqcontains("Courier New") && fixed_priority < 15){
m_fixed_font = font;
fixed_priority = 15;
- } else if ( (font.contains("Luxi Mono") || font.contains("Lucidux Mono")) && fixed_priority < 10 ) {
+ } else if ( (font.tqcontains("Luxi Mono") || font.tqcontains("Lucidux Mono")) && fixed_priority < 10 ) {
m_fixed_font = font;
fixed_priority = 10;
- } else if (font.contains("Andale Mono") && fixed_priority < 5) {
+ } else if (font.tqcontains("Andale Mono") && fixed_priority < 5) {
m_fixed_font = font;
fixed_priority = 5;
- } else if ( font.contains("Mono") && m_fdb->isSmoothlyScalable(font) && fixed_priority < 3 ) {
+ } else if ( font.tqcontains("Mono") && m_fdb->isSmoothlyScalable(font) && fixed_priority < 3 ) {
m_fixed_font = font;
fixed_priority = 3;
} else if ( m_fdb->isSmoothlyScalable(font) && m_fdb->isFixedPitch(font,"Normal") && fixed_priority < 2 ) {
@@ -201,11 +201,11 @@ TQFont KSysInfo::getFixedWidthFont(){
// File Parser
while (file->readLine(buf, sizeof(buf) - 1) > 0) {
TQString s1 = TQString::fromLocal8Bit(buf);
- TQString s2 = s1.mid(s1.find(":") + 1);
- s1.truncate(s1.find(":"));
+ TQString s2 = s1.mid(s1.tqfind(":") + 1);
+ s1.truncate(s1.tqfind(":"));
s1=s1.stripWhiteSpace();
s2=s2.stripWhiteSpace();
- if(s1.contains("MHz")){
+ if(s1.tqcontains("MHz")){
float fspeed = s2.toFloat(0);
fspeed = floor(fspeed);
m_cpu_speed = (int)fspeed;
diff --git a/kpersonalizer/stylepreview.ui b/kpersonalizer/stylepreview.ui
index 0f0972b8..7e132c4c 100644
--- a/kpersonalizer/stylepreview.ui
+++ b/kpersonalizer/stylepreview.ui
@@ -1,6 +1,6 @@
<!DOCTYPE UI><UI version="3.0" stdsetdef="1">
<class>StylePreview</class>
-<widget class="QWidget">
+<widget class="TQWidget">
<property name="name">
<cstring>StylePreview</cstring>
</property>
@@ -16,7 +16,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QFrame">
+ <widget class="TQFrame">
<property name="name">
<cstring>Frame3</cstring>
</property>
@@ -30,11 +30,11 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QTabWidget" row="0" column="0">
+ <widget class="TQTabWidget" row="0" column="0">
<property name="name">
<cstring>TabWidget2</cstring>
</property>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -45,7 +45,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QProgressBar" row="0" column="1" rowspan="1" colspan="2">
+ <widget class="TQProgressBar" row="0" column="1" rowspan="1" colspan="2">
<property name="name">
<cstring>ProgressBar1</cstring>
</property>
@@ -53,7 +53,7 @@
<number>70</number>
</property>
</widget>
- <widget class="QPushButton" row="2" column="2">
+ <widget class="TQPushButton" row="2" column="2">
<property name="name">
<cstring>PushButton1</cstring>
</property>
@@ -61,12 +61,12 @@
<string>Button</string>
</property>
</widget>
- <widget class="QSpinBox" row="2" column="1">
+ <widget class="TQSpinBox" row="2" column="1">
<property name="name">
<cstring>SpinBox1</cstring>
</property>
</widget>
- <widget class="QComboBox" row="3" column="1" rowspan="1" colspan="2">
+ <widget class="TQComboBox" row="3" column="1" rowspan="1" colspan="2">
<item>
<property name="text">
<string>ComboBox</string>
@@ -76,7 +76,7 @@
<cstring>ComboBox1</cstring>
</property>
</widget>
- <widget class="QSlider" row="1" column="1" rowspan="1" colspan="2">
+ <widget class="TQSlider" row="1" column="1" rowspan="1" colspan="2">
<property name="name">
<cstring>Slider1</cstring>
</property>
@@ -84,7 +84,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QButtonGroup" row="0" column="0" rowspan="4" colspan="1">
+ <widget class="TQButtonGroup" row="0" column="0" rowspan="4" colspan="1">
<property name="name">
<cstring>ButtonGroup1</cstring>
</property>
@@ -95,7 +95,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>RadioButton1</cstring>
</property>
@@ -106,7 +106,7 @@
<bool>true</bool>
</property>
</widget>
- <widget class="QRadioButton">
+ <widget class="TQRadioButton">
<property name="name">
<cstring>RadioButton2</cstring>
</property>
@@ -128,7 +128,7 @@
<enum>Horizontal</enum>
</property>
</widget>
- <widget class="QCheckBox">
+ <widget class="TQCheckBox">
<property name="name">
<cstring>CheckBox1</cstring>
</property>
@@ -144,7 +144,7 @@
</widget>
</vbox>
</widget>
- <widget class="QScrollBar" row="0" column="3" rowspan="4" colspan="1">
+ <widget class="TQScrollBar" row="0" column="3" rowspan="4" colspan="1">
<property name="name">
<cstring>ScrollBar1</cstring>
</property>
@@ -157,7 +157,7 @@
</widget>
</grid>
</widget>
- <widget class="QWidget">
+ <widget class="TQWidget">
<property name="name">
<cstring>tab</cstring>
</property>
@@ -176,10 +176,10 @@
<include location="local" impldecl="in implementation">stylepreview.ui.h</include>
<include location="local" impldecl="in implementation">kdialog.h</include>
</includes>
-<slots>
+<Q_SLOTS>
<slot>init()</slot>
- <slot returnType="bool">eventFilter( QObject * obj, QEvent * ev )</slot>
-</slots>
+ <slot returnType="bool">eventFilter( TQObject * obj, TQEvent * ev )</slot>
+</Q_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 d073ddc3..048f9fba 100644
--- a/kpersonalizer/stylepreview.ui.h
+++ b/kpersonalizer/stylepreview.ui.h
@@ -48,7 +48,7 @@ void StylePreview::init()
{
++it;
obj->installEventFilter(this);
- ((TQWidget*)obj)->setFocusPolicy(NoFocus);
+ ((TQWidget*)obj)->setFocusPolicy(TQ_NoFocus);
}
delete l;
}