From c663b6440964f6ac48027143ac9e63298991f9d0 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:33:34 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1157639 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kpersonalizer/kcountrypage.cpp | 84 +++++++++++------------ kpersonalizer/kcountrypage.h | 8 +-- kpersonalizer/keyecandypage.cpp | 144 ++++++++++++++++++++-------------------- kpersonalizer/keyecandypage.h | 68 +++++++++---------- kpersonalizer/kfindlanguage.cpp | 50 +++++++------- kpersonalizer/kfindlanguage.h | 20 +++--- kpersonalizer/kospage.cpp | 28 ++++---- kpersonalizer/kospage.h | 8 +-- kpersonalizer/kpersonalizer.cpp | 68 +++++++++---------- kpersonalizer/kpersonalizer.h | 8 +-- kpersonalizer/krefinepage.cpp | 8 +-- kpersonalizer/krefinepage.h | 2 +- kpersonalizer/kstylepage.cpp | 110 +++++++++++++++--------------- kpersonalizer/kstylepage.h | 104 ++++++++++++++--------------- kpersonalizer/ksysinfo.cpp | 42 ++++++------ kpersonalizer/ksysinfo.h | 16 ++--- kpersonalizer/stylepreview.ui.h | 32 ++++----- 17 files changed, 400 insertions(+), 400 deletions(-) (limited to 'kpersonalizer') diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp index 699739580..ee8f44b87 100644 --- a/kpersonalizer/kcountrypage.cpp +++ b/kpersonalizer/kcountrypage.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ -#include -#include -#include +#include +#include +#include #include #include @@ -33,12 +33,12 @@ #include "kcountrypage.h" -KCountryPage::KCountryPage(QWidget *parent, const char *name ) : KCountryPageDlg(parent,name) { +KCountryPage::KCountryPage(TQWidget *parent, const char *name ) : KCountryPageDlg(parent,name) { px_introSidebar->setPixmap(UserIcon("step1.png")); - connect(cb_country, SIGNAL(activated(const QString &)), SLOT(setLangForCountry(const QString &))); - connect(cb_language, SIGNAL(activated(const QString &)), SLOT(setLanguageChanged())); + connect(cb_country, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(setLangForCountry(const TQString &))); + connect(cb_language, TQT_SIGNAL(activated(const TQString &)), TQT_SLOT(setLanguageChanged())); // naturally, the language is not changed on startup b_savedLanguageChanged = false; @@ -76,20 +76,20 @@ KCountryPage::~KCountryPage(){ void KCountryPage::loadCountryList(KLanguageButton *combo) { - QString sub = QString::fromLatin1("l10n/"); + TQString sub = TQString::fromLatin1("l10n/"); // clear the list combo->clear(); - QStringList regionfiles = KGlobal::dirs()->findAllResources("locale", sub + "*.desktop"); - QMap regionnames; + TQStringList regionfiles = KGlobal::dirs()->findAllResources("locale", sub + "*.desktop"); + TQMap regionnames; - for ( QStringList::ConstIterator it = regionfiles.begin(); it != regionfiles.end(); ++it ) { + for ( TQStringList::ConstIterator it = regionfiles.begin(); it != regionfiles.end(); ++it ) { KSimpleConfig entry(*it); - entry.setGroup(QString::fromLatin1("KCM Locale")); - QString name = entry.readEntry(QString::fromLatin1("Name"), i18n("without name")); + entry.setGroup(TQString::fromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); - QString tag = *it; + TQString tag = *it; int index; index = tag.findRev('/'); @@ -103,43 +103,43 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) { regionnames.insert(name, tag); } - for ( QMap::ConstIterator mit = regionnames.begin(); mit != regionnames.end(); ++mit ) { + for ( TQMap::ConstIterator mit = regionnames.begin(); mit != regionnames.end(); ++mit ) { combo->insertSubmenu( mit.key(), '-' + mit.data(), sub ); } // add all languages to the list - QStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + "*/entry.desktop"); + TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + "*/entry.desktop"); countrylist.sort(); - for ( QStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) { + for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) { KSimpleConfig entry(*it); - entry.setGroup(QString::fromLatin1("KCM Locale")); - QString name = entry.readEntry(QString::fromLatin1("Name"), i18n("without name")); - QString submenu = '-' + entry.readEntry("Region"); + entry.setGroup(TQString::fromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); + TQString submenu = '-' + entry.readEntry("Region"); - QString tag = *it; + TQString tag = *it; int index = tag.findRev('/'); tag.truncate(index); index = tag.findRev('/'); tag = tag.mid(index+1); - QPixmap flag( locate( "locale", QString::fromLatin1("l10n/%1/flag.png").arg(tag) ) ); - QIconSet icon( flag ); + TQPixmap flag( locate( "locale", TQString::fromLatin1("l10n/%1/flag.png").arg(tag) ) ); + TQIconSet icon( flag ); combo->insertItem( icon, name, tag, submenu ); } } void KCountryPage::fillLanguageMenu(KLanguageButton *combo) { combo->clear(); - QString submenu; // we are working on this menu - QStringList langlist = flang->getLangList(); - QMap langmap = flang->getLangMap(); - QStringList::ConstIterator it; + TQString submenu; // we are working on this menu + TQStringList langlist = flang->getLangList(); + TQMap langmap = flang->getLangMap(); + TQStringList::ConstIterator it; for ( it = langlist.begin(); it != langlist.end(); ++it ) { if ((*it).isNull()) { combo->insertSeparator(); - submenu = QString::fromLatin1("all"); - combo->insertSubmenu(i18n("All"), submenu, QString::null); + submenu = TQString::fromLatin1("all"); + combo->insertSubmenu(i18n("All"), submenu, TQString::null); continue; } combo->insertItem(langmap[(*it)], (*it), submenu ); @@ -151,43 +151,43 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan kdDebug() << "KCountryPage::save()" << endl; KConfigBase *config = KGlobal::config(); - config->setGroup(QString::fromLatin1("Locale")); - config->writeEntry(QString::fromLatin1("Country"), comboCountry->current(), true, true); - config->writeEntry(QString::fromLatin1("Language"), comboLang->current(), true, true); + config->setGroup(TQString::fromLatin1("Locale")); + config->writeEntry(TQString::fromLatin1("Country"), comboCountry->current(), true, true); + config->writeEntry(TQString::fromLatin1("Language"), comboLang->current(), true, true); config->sync(); // only make the system reload the language, if the selected one deferes from the old saved one. if (b_savedLanguageChanged) { // Tell kdesktop about the new language - QCString replyType; QByteArray replyData; - QByteArray data, da; - QDataStream stream( data, IO_WriteOnly ); + TQCString replyType; TQByteArray replyData; + TQByteArray data, da; + TQDataStream stream( data, IO_WriteOnly ); stream << comboLang->current(); if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); // ksycoca needs to be rebuilt KProcess proc; - proc << QString::fromLatin1("kbuildsycoca"); + proc << TQString::fromLatin1("kbuildsycoca"); proc.start(KProcess::DontCare); kdDebug() << "KLocaleConfig::save : sending signal to kdesktop" << endl; // inform kicker and kdeskop about the new language - kapp->dcopClient()->send( "kicker", "Panel", "restart()", QString::null); + kapp->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(QString)", data, replyType, replyData ); + kapp->dcopClient()->call( "kdesktop", "KDesktopIface", "languageChanged(TQString)", data, replyType, replyData ); } // KPersonalizer::next() probably waits for a return-value return true; } -void KCountryPage::setLangForCountry(const QString &country) { +void KCountryPage::setLangForCountry(const TQString &country) { KSimpleConfig ent(locate("locale", "l10n/" + country + "/entry.desktop"), true); - ent.setGroup(QString::fromLatin1("KCM Locale")); - langs = ent.readListEntry(QString::fromLatin1("Languages")); + ent.setGroup(TQString::fromLatin1("KCM Locale")); + langs = ent.readListEntry(TQString::fromLatin1("Languages")); - QString lang = QString::fromLatin1("en_US"); + TQString lang = TQString::fromLatin1("en_US"); // use the first INSTALLED langauge in the list, or default to C - for ( QStringList::Iterator it = langs.begin(); it != langs.end(); ++it ) { + for ( TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it ) { if (cb_language->contains(*it)) { lang = *it; break; diff --git a/kpersonalizer/kcountrypage.h b/kpersonalizer/kcountrypage.h index 7b30b5ba4..eade9fc67 100644 --- a/kpersonalizer/kcountrypage.h +++ b/kpersonalizer/kcountrypage.h @@ -31,7 +31,7 @@ class KFindLanguage; class KCountryPage : public KCountryPageDlg { Q_OBJECT public: - KCountryPage(QWidget *parent=0, const char *name=0); + KCountryPage(TQWidget *parent=0, const char *name=0); ~KCountryPage(); void loadCountryList(KLanguageButton *combo); @@ -44,12 +44,12 @@ public: bool b_startedLanguageChanged; private: - QStringList langs; - QString s_oldlocale; + TQStringList langs; + TQString s_oldlocale; KFindLanguage *flang; private slots: // Private slots - void setLangForCountry(const QString &); + void setLangForCountry(const TQString &); void setLanguageChanged(); }; diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp index f7794724c..3349ab4c3 100644 --- a/kpersonalizer/keyecandypage.cpp +++ b/kpersonalizer/keyecandypage.cpp @@ -14,15 +14,15 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -45,7 +45,7 @@ #include "ksysinfo.h" #include "keyecandypage.h" -KEyeCandyPage::KEyeCandyPage(QWidget *parent, const char *name ) : KEyeCandyPageDlg(parent,name) { +KEyeCandyPage::KEyeCandyPage(TQWidget *parent, const char *name ) : KEyeCandyPageDlg(parent,name) { kwinconf = new KConfig("kwinrc", false, true); kwineventconf = new KConfig("kwin.eventsrc", false, false); @@ -68,61 +68,61 @@ KEyeCandyPage::KEyeCandyPage(QWidget *parent, const char *name ) : KEyeCandyPage klv_features->setFullWidth (true); // Level 1 - desktop_wallpaper = new QCheckListItem(klv_features, i18n("Desktop Wallpaper"), - QCheckListItem::CheckBox); - desktop_window_effects= new QCheckListItem(klv_features, i18n("Window Moving/Resizing Effects"), - QCheckListItem::CheckBox); - desktop_window_moving_contents= new QCheckListItem(klv_features, i18n("Display Contents in Moving/Resizing Windows"), - QCheckListItem::CheckBox); + desktop_wallpaper = new TQCheckListItem(klv_features, i18n("Desktop Wallpaper"), + TQCheckListItem::CheckBox); + desktop_window_effects= new TQCheckListItem(klv_features, i18n("Window Moving/Resizing Effects"), + TQCheckListItem::CheckBox); + desktop_window_moving_contents= new TQCheckListItem(klv_features, i18n("Display Contents in Moving/Resizing Windows"), + TQCheckListItem::CheckBox); // Level 2 - backgrounds_konqueror= new QCheckListItem(klv_features, i18n("File Manager Background Picture"), - QCheckListItem::CheckBox); - backgrounds_panel= new QCheckListItem(klv_features, i18n("Panel Background Picture"), - QCheckListItem::CheckBox); + backgrounds_konqueror= new TQCheckListItem(klv_features, i18n("File Manager Background Picture"), + TQCheckListItem::CheckBox); + backgrounds_panel= new TQCheckListItem(klv_features, i18n("Panel Background Picture"), + TQCheckListItem::CheckBox); // Level 3 - icon_zooming_panel = new QCheckListItem(klv_features, i18n("Panel Icon Popups"), - QCheckListItem::CheckBox); - icon_effect_gamma = new QCheckListItem(klv_features, i18n("Icon Highlighting"), - QCheckListItem::CheckBox); - icon_mng_animation = new QCheckListItem(klv_features, i18n("File Manager Icon Animation"), - QCheckListItem::CheckBox); + icon_zooming_panel = new TQCheckListItem(klv_features, i18n("Panel Icon Popups"), + TQCheckListItem::CheckBox); + icon_effect_gamma = new TQCheckListItem(klv_features, i18n("Icon Highlighting"), + TQCheckListItem::CheckBox); + icon_mng_animation = new TQCheckListItem(klv_features, i18n("File Manager Icon Animation"), + TQCheckListItem::CheckBox); - sound_scheme = new QCheckListItem(klv_features, i18n("Sound Theme"), - QCheckListItem::CheckBox); + sound_scheme = new TQCheckListItem(klv_features, i18n("Sound Theme"), + TQCheckListItem::CheckBox); // Level 4 /////////////////////////////////////////////////////////////////////////////////// /// DEPENDEND ON RESOLUTION; DEFAULT: DON`T USE IN LEVELS - icon_effect_size_desktop = new QCheckListItem(klv_features, i18n("Large Desktop Icons"), - QCheckListItem::CheckBox); - icon_effect_size_panel = new QCheckListItem(klv_features, i18n("Large Panel Icons"), - QCheckListItem::CheckBox); + icon_effect_size_desktop = new TQCheckListItem(klv_features, i18n("Large Desktop Icons"), + TQCheckListItem::CheckBox); + icon_effect_size_panel = new TQCheckListItem(klv_features, i18n("Large Panel Icons"), + TQCheckListItem::CheckBox); /// DEPENDEND ON RESOLUTION; DEFAULT: DON`T USE IN LEVELS /////////////////////////////////////////////////////////////////////////////////// - antialiasing_fonts = new QCheckListItem(klv_features, i18n("Smoothed Fonts " - "(Antialiasing)"), QCheckListItem::CheckBox); + antialiasing_fonts = new TQCheckListItem(klv_features, i18n("Smoothed Fonts " + "(Antialiasing)"), TQCheckListItem::CheckBox); // Level 5 - preview_images = new QCheckListItem(klv_features, i18n("Preview Images"), - QCheckListItem::CheckBox); - pushbutton_icons = new QCheckListItem(klv_features, i18n("Icons on Buttons"), - QCheckListItem::CheckBox); + preview_images = new TQCheckListItem(klv_features, i18n("Preview Images"), + TQCheckListItem::CheckBox); + pushbutton_icons = new TQCheckListItem(klv_features, i18n("Icons on Buttons"), + TQCheckListItem::CheckBox); // Level 6 - animated_combo = new QCheckListItem(klv_features, i18n("Animated Combo Boxes"), - QCheckListItem::CheckBox); + animated_combo = new TQCheckListItem(klv_features, i18n("Animated Combo Boxes"), + TQCheckListItem::CheckBox); // Level 7 - fading_tooltips = new QCheckListItem(klv_features, i18n("Fading Tooltips"), QCheckListItem::CheckBox); + fading_tooltips = new TQCheckListItem(klv_features, i18n("Fading Tooltips"), TQCheckListItem::CheckBox); // Level 8 - preview_text = new QCheckListItem(klv_features, i18n("Preview Text Files"), - QCheckListItem::CheckBox); + preview_text = new TQCheckListItem(klv_features, i18n("Preview Text Files"), + TQCheckListItem::CheckBox); // Level 9 - fading_menus= new QCheckListItem(klv_features, i18n("Fading Menus"), - QCheckListItem::CheckBox); - preview_other = new QCheckListItem(klv_features, i18n("Preview Other Files"), - QCheckListItem::CheckBox); + fading_menus= new TQCheckListItem(klv_features, i18n("Fading Menus"), + TQCheckListItem::CheckBox); + preview_other = new TQCheckListItem(klv_features, i18n("Preview Other Files"), + TQCheckListItem::CheckBox); getUserDefaults(); // get user's current settings setDefaults(); // set the initial level on the slider and checkboxes @@ -191,10 +191,10 @@ void KEyeCandyPage::slotEyeCandySliderMoved(int value){ // Level 4 icon_mng_animation->setOn(true); if(osStyle=="mac" || osStyle=="CDE"){ - for (int i = 0; i < QApplication::desktop()->numScreens(); i++) { - if(QApplication::desktop()->screenGeometry(i).width() >= 1024) + for (int i = 0; i < TQApplication::desktop()->numScreens(); i++) { + if(TQApplication::desktop()->screenGeometry(i).width() >= 1024) icon_effect_size_desktop->setOn(true); // enable 48x48 icons by default if a screen size is wider than 1024 - if(QApplication::desktop()->screenGeometry(i).width() >= 1280) + if(TQApplication::desktop()->screenGeometry(i).width() >= 1280) icon_effect_size_panel->setOn(true); } } @@ -217,10 +217,10 @@ void KEyeCandyPage::slotEyeCandySliderMoved(int value){ // Level 8 preview_text->setOn(true); // icon-size (now for all selections) - for (int i = 0; i < QApplication::desktop()->numScreens(); i++) { - if(QApplication::desktop()->screenGeometry(i).width() >= 1024) + for (int i = 0; i < TQApplication::desktop()->numScreens(); i++) { + if(TQApplication::desktop()->screenGeometry(i).width() >= 1024) icon_effect_size_desktop->setOn(true); - if(QApplication::desktop()->screenGeometry(i).width() >= 1280) + if(TQApplication::desktop()->screenGeometry(i).width() >= 1280) icon_effect_size_panel->setOn(true); } } @@ -252,7 +252,7 @@ void KEyeCandyPage::enableDesktopWallpaper(bool enable, bool user){ //here we change the kdesktop font color to white as it fits better // to the KDE34png.png gray background kdesktopconf->setGroup("FMSettings"); - kdesktopconf->writeEntry("NormalTextColor", QColor("#FFFFFF") ); + kdesktopconf->writeEntry("NormalTextColor", TQColor("#FFFFFF") ); kdesktopconf->setGroup("Desktop0"); } else{ @@ -359,7 +359,7 @@ void KEyeCandyPage::enableBackgroundsKonqueror(bool enable){ konqbgimage="kde4ever.png"; konquerorconf->writePathEntry("BgImage", konqbgimage); } else - konquerorconf->writePathEntry("BgImage", QString::null); + konquerorconf->writePathEntry("BgImage", TQString::null); } //----------------------------BACKGROUNDS------------------------------------------------- @@ -406,8 +406,8 @@ void KEyeCandyPage::enableIconMngAnimation(bool enable) { /** No descriptions */ void KEyeCandyPage::enableIconEffectSizePanel(bool enable){ - QByteArray data; - QDataStream stream( data, IO_WriteOnly ); + TQByteArray data; + TQDataStream stream( data, IO_WriteOnly ); if(enable) stream << 56; @@ -486,8 +486,8 @@ and ask them here, set the according string list here. kdesktoprc's stringlist holds the preview-types wich are supposed to be shown, while konquiconviewrc's one holds the types, wich are NOT supposed to be shown. We need to take care of that here, too.*/ void KEyeCandyPage::enablePreview(bool currSettings){ - QStringList desktopPreviews; - QStringList konquerorNoPreviews; + TQStringList desktopPreviews; + TQStringList konquerorNoPreviews; KTrader::OfferList plugins = KTrader::self()->query("ThumbCreator"); for (KTrader::OfferList::ConstIterator it = plugins.begin(); it != plugins.end(); ++it) { if(prevOther){ @@ -595,12 +595,12 @@ void KEyeCandyPage::enableAntialiasingFonts(bool enable, bool reset){ if (!reset){ if ( ( (sys->isXfromXFreeInc() && (sys->getXRelease() > 40000000)) || sys->isXfromXOrg() ) && sys->getRenderSupport()) { - QSettings().writeEntry("/qt/useXft", enable); - QSettings().writeEntry("/qt/enableXft", enable); + TQSettings().writeEntry("/qt/useXft", enable); + TQSettings().writeEntry("/qt/enableXft", enable); } } else { - QSettings().writeEntry("/qt/useXft", b_useXft); - QSettings().writeEntry("/qt/enableXft", b_enableXft); + TQSettings().writeEntry("/qt/useXft", b_useXft); + TQSettings().writeEntry("/qt/enableXft", b_enableXft); } } //----------------------------OTHER STUFF------------------------------------------------- @@ -625,7 +625,7 @@ void KEyeCandyPage::save(bool currSettings){ kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); // set the display options (style effects) KIPC::sendMessageAll(KIPC::SettingsChanged); - QApplication::syncX(); + TQApplication::syncX(); // kicker stuff: Iconzooming etc. kapp->dcopClient()->send( "kicker", "Panel", "configure()", "" ); // Icon stuff @@ -672,16 +672,16 @@ void KEyeCandyPage::setDefaults(){ /** retrieves the user's local values. In case he doesn't have these set, use the default values of KDE, level 4. */ void KEyeCandyPage::getUserDefaults(){ - QByteArray replydata; - QByteArray data; - QCString replytype; + TQByteArray replydata; + TQByteArray data; + TQCString replytype; kapp->dcopClient()->call( "kicker", "Panel", "panelSize()",data, replytype, replydata); - QDataStream stream( replydata, IO_ReadOnly ); + TQDataStream stream( replydata, IO_ReadOnly ); stream >> panelsize; // Wallpaper-User-Defaults kdesktopconf->setGroup("FMSettings"); - QColor tempcolor=KGlobalSettings::textColor(); + TQColor tempcolor=KGlobalSettings::textColor(); desktopTextColor = kdesktopconf->readColorEntry("NormalTextColor", &tempcolor ); kdesktopconf->setGroup("Background Common"); st_UserWallpaper.CommonDesktop = kdesktopconf->readBoolEntry("CommonDesktop", true); @@ -695,8 +695,8 @@ void KEyeCandyPage::getUserDefaults(){ KGlobal::config()->setGroup("KDE"); // Font-User-Defaults - b_useXft=QSettings().readBoolEntry("/qt/useXft"); - b_enableXft=QSettings().readBoolEntry("/qt/enableXft"); + b_useXft=TQSettings().readBoolEntry("/qt/useXft"); + b_enableXft=TQSettings().readBoolEntry("/qt/enableXft"); KGlobal::config()->setGroup("PanelIcons"); st_UserGamma.EffectPanel=KGlobal::config()->readEntry("ActiveEffect", "none"); @@ -845,7 +845,7 @@ void KEyeCandyPage::saveCheckState(bool currSettings){ // currSettings= true -> /** to be connected to the OS page. changes default values of features according to the desktop selection*/ -void KEyeCandyPage::slotPresetSlider(const QString& style){ +void KEyeCandyPage::slotPresetSlider(const TQString& style){ osStyle=style; slotEyeCandySliderMoved( sld_effects-> value()); //apply changes (slider is not moved) } diff --git a/kpersonalizer/keyecandypage.h b/kpersonalizer/keyecandypage.h index 9cb0e4596..2e68b2d9c 100644 --- a/kpersonalizer/keyecandypage.h +++ b/kpersonalizer/keyecandypage.h @@ -31,7 +31,7 @@ class KSysInfo; class KEyeCandyPage : public KEyeCandyPageDlg { Q_OBJECT public: - KEyeCandyPage(QWidget *parent=0, const char *name=0); + KEyeCandyPage(TQWidget *parent=0, const char *name=0); ~KEyeCandyPage(); //--------------------------------------------------------------------------------------------------------- @@ -125,34 +125,34 @@ public slots: void slotEyeCandyShowDetails(bool details); /** to be connected to the OS page. changes default values of features according to the desktop selection*/ - void slotPresetSlider(const QString& style); + void slotPresetSlider(const TQString& style); private: // DEFAULT VALUES SET BY USER int panelsize; // kicker panelsize 0,1,2,3 before the big icons are set to reset that int desktopiconsize; - QString osStyle; //stores OS-Style selection (page 2) + TQString osStyle; //stores OS-Style selection (page 2) bool b_EffectFadeMenu, b_EffectAnimateCombo, b_EffectFadeTooltip, b_EnableIconZoom, b_AnimateMinimize, b_AnimateShade, b_MoveResizeMaximizedWindows, b_ShadeHover, b_useXft, b_enableXft, b_PushButtonIcons, b_EffectsEnabled, b_iconMngAnim, b_konq_prev_sound, b_konq_prev_enable, b_OpaqueResize; - QString konqbgimage, s_ResizeMode, s_MoveMode, deskbgimage; - QStringList konq_dont_prev, kdesktop_prev; - QColor desktopTextColor; + TQString konqbgimage, s_ResizeMode, s_MoveMode, deskbgimage; + TQStringList konq_dont_prev, kdesktop_prev; + TQColor desktopTextColor; struct st_Gamma{ - QString EffectDesktop; - QString EffectPanel; - QString ValueDesktop; - QString ValuePanel; + TQString EffectDesktop; + TQString EffectPanel; + TQString ValueDesktop; + TQString ValuePanel; } st_UserGamma; struct st_Wallpaper{ bool CommonDesktop; - QString MultiWallpaperMode; - QString WallpaperMode; - QString Wallpaper; + TQString MultiWallpaperMode; + TQString WallpaperMode; + TQString Wallpaper; } st_UserWallpaper; struct st_Sound { @@ -191,37 +191,37 @@ private: bool prevImage, prevText, prevOther; - QCheckListItem* alpha_blending_desktop; - QCheckListItem* alpha_blending_panel; + TQCheckListItem* alpha_blending_desktop; + TQCheckListItem* alpha_blending_panel; - QCheckListItem* animated_combo; + TQCheckListItem* animated_combo; - QCheckListItem* antialiasing_fonts; + TQCheckListItem* antialiasing_fonts; - QCheckListItem* backgrounds_konqueror; - QCheckListItem* backgrounds_panel; + TQCheckListItem* backgrounds_konqueror; + TQCheckListItem* backgrounds_panel; - QCheckListItem* desktop_wallpaper; - QCheckListItem* desktop_window_effects; - QCheckListItem* desktop_window_moving_contents; + TQCheckListItem* desktop_wallpaper; + TQCheckListItem* desktop_window_effects; + TQCheckListItem* desktop_window_moving_contents; - QCheckListItem* icon_effect_gamma; - QCheckListItem* icon_effect_size_desktop; - QCheckListItem* icon_effect_size_panel; + TQCheckListItem* icon_effect_gamma; + TQCheckListItem* icon_effect_size_desktop; + TQCheckListItem* icon_effect_size_panel; - QCheckListItem* icon_zooming_panel; - QCheckListItem* icon_mng_animation; + TQCheckListItem* icon_zooming_panel; + TQCheckListItem* icon_mng_animation; - QCheckListItem* fading_menus; - QCheckListItem* fading_tooltips; + TQCheckListItem* fading_menus; + TQCheckListItem* fading_tooltips; - QCheckListItem* pushbutton_icons; + TQCheckListItem* pushbutton_icons; - QCheckListItem* preview_text; - QCheckListItem* preview_images; - QCheckListItem* preview_other; + TQCheckListItem* preview_text; + TQCheckListItem* preview_images; + TQCheckListItem* preview_other; - QCheckListItem* sound_scheme; + TQCheckListItem* sound_scheme; }; #endif diff --git a/kpersonalizer/kfindlanguage.cpp b/kpersonalizer/kfindlanguage.cpp index b1ebb419b..a23f98322 100644 --- a/kpersonalizer/kfindlanguage.cpp +++ b/kpersonalizer/kfindlanguage.cpp @@ -17,9 +17,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include @@ -38,7 +38,7 @@ KFindLanguage::KFindLanguage() { m_country = config->readEntry("Country", "C"); if (m_country == "C") { - m_country = QString::fromLatin1(getenv("LANG")); + m_country = TQString::fromLatin1(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("_")) @@ -54,34 +54,34 @@ KFindLanguage::KFindLanguage() { } // get the users primary Languages - KSimpleConfig ent(locate("locale", QString::fromLatin1("l10n/%1/entry.desktop").arg(m_country)), true); + KSimpleConfig ent(locate("locale", TQString::fromLatin1("l10n/%1/entry.desktop").arg(m_country)), true); ent.setGroup("KCM Locale"); - QStringList langs = ent.readListEntry("Languages"); + TQStringList langs = ent.readListEntry("Languages"); if (langs.isEmpty()) langs.append("en_US"); // add the primary languages for the country to the list - QStringList prilang; - for ( QStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it ) { - QString str = locate("locale", *it + "/entry.desktop"); + TQStringList prilang; + for ( TQStringList::ConstIterator it = langs.begin(); it != langs.end(); ++it ) { + TQString str = locate("locale", *it + "/entry.desktop"); if (!str.isNull()) prilang << str; } // add all languages to the list - QStringList alllang = KGlobal::dirs()->findAllResources("locale", "*/entry.desktop", false, true); + TQStringList alllang = KGlobal::dirs()->findAllResources("locale", "*/entry.desktop", false, true); alllang.sort(); - QStringList langlist = prilang; + TQStringList langlist = prilang; if (langlist.count() > 0) - langlist << QString::null; // separator + langlist << TQString::null; // separator langlist += alllang; - for ( QStringList::ConstIterator it = langlist.begin(); it != langlist.end(); ++it ) { + for ( TQStringList::ConstIterator it = langlist.begin(); it != langlist.end(); ++it ) { KSimpleConfig entry(*it); entry.setGroup("KCM Locale"); - QString name = entry.readEntry("Name", i18n("without name")); + TQString name = entry.readEntry("Name", i18n("without name")); - QString tag = *it; + TQString tag = *it; int index = tag.findRev('/'); tag = tag.left(index); index = tag.findRev('/'); @@ -92,11 +92,11 @@ KFindLanguage::KFindLanguage() { } // now find the best language for the user - QString compare = m_oldlang; + TQString compare = m_oldlang; if (m_oldlang.isEmpty()) { compare = langs.first(); - for(QStringList::Iterator it = langs.begin(); it != langs.end(); ++it) { - if (*it == QString::fromLatin1(getenv("LANG")).mid(3, 2).lower()) + for(TQStringList::Iterator it = langs.begin(); it != langs.end(); ++it) { + if (*it == TQString::fromLatin1(getenv("LANG")).mid(3, 2).lower()) compare = *it; } } @@ -106,10 +106,10 @@ KFindLanguage::KFindLanguage() { // Find the users's language int bestmatch = -1; - QStringList::ConstIterator it; + TQStringList::ConstIterator it; for( it = m_langlist.begin(); it != m_langlist.end(); ++it) { int match=0; - QString l = (*it).left((*it).find(";")); + TQString l = (*it).left((*it).find(";")); if (l == "C") match++; if(l.contains(compare)) @@ -130,22 +130,22 @@ KFindLanguage::KFindLanguage() { KFindLanguage::~KFindLanguage() { } -QStringList KFindLanguage::getLangList() const { +TQStringList KFindLanguage::getLangList() const { return m_langlist; } -QMap KFindLanguage::getLangMap() const { +TQMap KFindLanguage::getLangMap() const { return m_langmap; } -QString KFindLanguage::getBestLang() const { +TQString KFindLanguage::getBestLang() const { return m_bestlang; } -QString KFindLanguage::getOldLang() const { +TQString KFindLanguage::getOldLang() const { return m_oldlang; } -QString KFindLanguage::getCountry() const { +TQString KFindLanguage::getCountry() const { return m_country; } diff --git a/kpersonalizer/kfindlanguage.h b/kpersonalizer/kfindlanguage.h index 1c57f3017..961c14092 100644 --- a/kpersonalizer/kfindlanguage.h +++ b/kpersonalizer/kfindlanguage.h @@ -22,17 +22,17 @@ class KFindLanguage { public: KFindLanguage(); ~KFindLanguage(); - QStringList getLangList() const; - QMap getLangMap() const; - QString getBestLang() const; - QString getOldLang() const; - QString getCountry() const; + TQStringList getLangList() const; + TQMap getLangMap() const; + TQString getBestLang() const; + TQString getOldLang() const; + TQString getCountry() const; private: - QStringList m_langlist; // stores tags like "en_US" - QMap m_langmap; // stores tag -> name pairs - QString m_country; - QString m_oldlang; - QString m_bestlang; + TQStringList m_langlist; // stores tags like "en_US" + TQMap m_langmap; // stores tag -> name pairs + TQString m_country; + TQString m_oldlang; + TQString m_bestlang; }; #endif diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp index 81c2e57b6..839cc241a 100644 --- a/kpersonalizer/kospage.cpp +++ b/kpersonalizer/kospage.cpp @@ -15,11 +15,11 @@ * * ***************************************************************************/ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -36,7 +36,7 @@ #include "kospage.h" -KOSPage::KOSPage(QWidget *parent, const char *name ) : KOSPageDlg(parent,name) { +KOSPage::KOSPage(TQWidget *parent, const char *name ) : KOSPageDlg(parent,name) { px_osSidebar->setPixmap(UserIcon("step2.png")); // initialize the textview with the default description - KDE of course slotKDEDescription(); @@ -87,10 +87,10 @@ void KOSPage::save(bool currSettings){ /////////////////////////////////////////// // kcmdisplay changes KIPC::sendMessageAll(KIPC::SettingsChanged); - QApplication::syncX(); + TQApplication::syncX(); // enable/disable the mac menu, call dcop // Tell kdesktop about the new config file - kapp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", QByteArray()); + kapp->dcopClient()->send("kdesktop", "KDesktopIface", "configure()", TQByteArray()); /////////////////////////////////////////// /// restart kwin for window effects kapp->dcopClient()->send("kwin*", "", "reconfigure()", ""); @@ -305,7 +305,7 @@ void KOSPage::writeMacOS(){ /** write Keyscheme to kdeglobals (called by saveCheckState) */ -void KOSPage::writeKeyEntrys(QString keyfile){ +void KOSPage::writeKeyEntrys(TQString keyfile){ kdDebug() << "KOSPage::writeKeyEntrys()" << endl; // load the given .kksrc - file @@ -314,13 +314,13 @@ void KOSPage::writeKeyEntrys(QString keyfile){ KSimpleConfig* defScheme = new KSimpleConfig(locate("keys", "kde3.kksrc"), true); // we need the entries from the default - file, so we can compare with them - QMap defMap = defScheme->entryMap("Global Shortcuts"); + TQMap defMap = defScheme->entryMap("Global Shortcuts"); // first delete the group in kdeglobals, then write the non-default entries from the global .kksrc - file cglobal->deleteGroup("Global Shortcuts", true, true); // get the Global - Shortcuts and write them to kdeglobals cglobal->setGroup("Global Shortcuts"); - QMap givenMap = scheme->entryMap("Global Shortcuts"); - for ( QMap::Iterator it = givenMap.begin(); it != givenMap.end(); ++it ) { + TQMap givenMap = scheme->entryMap("Global Shortcuts"); + for ( TQMap::Iterator it = givenMap.begin(); it != givenMap.end(); ++it ) { if ( (defMap[it.key()] == it.data()) && (it.data() != "none") ) { cglobal->writeEntry(it.key(), "default("+it.data()+")", true, true); } else { @@ -334,7 +334,7 @@ void KOSPage::writeKeyEntrys(QString keyfile){ cglobal->deleteGroup("Shortcuts", true, true); cglobal->setGroup("Shortcuts"); givenMap = scheme->entryMap("Shortcuts"); - for ( QMap::Iterator it = givenMap.begin(); it != givenMap.end(); ++it ) { + for ( TQMap::Iterator it = givenMap.begin(); it != givenMap.end(); ++it ) { // only write the entry, if it defers from kde3.kksrc if ( defMap[it.key()] != it.data() ) { cglobal->writeEntry(it.key(), it.data(), true, true); @@ -485,7 +485,7 @@ void KOSPage::writeUserKeys(){ kdDebug() << "KOSPage::writeUserKeys()" << endl; cglobal->setGroup("Global Shortcuts"); - QMap::Iterator it; + TQMap::Iterator it; for ( it = map_GlobalUserKeys.begin(); it != map_GlobalUserKeys.end(); ++it ) { cglobal->writeEntry(it.key(), it.data(), true, true); } diff --git a/kpersonalizer/kospage.h b/kpersonalizer/kospage.h index 05756e887..b28719dc1 100644 --- a/kpersonalizer/kospage.h +++ b/kpersonalizer/kospage.h @@ -28,7 +28,7 @@ class KOSPage : public KOSPageDlg { Q_OBJECT public: - KOSPage(QWidget *parent=0, const char *name=0); + KOSPage(TQWidget *parent=0, const char *name=0); ~KOSPage(); void save(bool currSettings=true); void saveCheckState(bool currSettings); @@ -36,7 +36,7 @@ public: void writeUNIX(); void writeWindows(); void writeMacOS(); - void writeKeyEntrys(QString keyfile); + void writeKeyEntrys(TQString keyfile); void writeUserKeys(); void writeUserDefaults(); /** retrieve the user's local values */ @@ -50,7 +50,7 @@ public: signals: // Signals /** emits either of: KDE, CDE, win or mac in save() depending on the selection made by the user. */ - void selectedOS(const QString&); + void selectedOS(const TQString&); private: KConfig* cglobal; KConfig* claunch; @@ -66,7 +66,7 @@ private: b_DesktopUnderline, b_KonqUnderline, b_ChangeCursor, b_syncClipboards; QString s_TitlebarDCC, s_FocusPolicy, s_AltTabStyle, s_MMB, s_TitlebarMMB, s_TitlebarRMB; - QMap map_AppUserKeys, map_GlobalUserKeys; + TQMap map_AppUserKeys, map_GlobalUserKeys; // DEFAULT VALLUES SET BY USER (END) }; #endif diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp index 0f92f8bb1..6b3692a04 100644 --- a/kpersonalizer/kpersonalizer.cpp +++ b/kpersonalizer/kpersonalizer.cpp @@ -17,13 +17,13 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -53,7 +53,7 @@ bool KPersonalizer::before_session = false; -KPersonalizer::KPersonalizer(QWidget *parent, const char *name) +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 @@ -65,34 +65,34 @@ KPersonalizer::KPersonalizer(QWidget *parent, const char *name) countrypage= new KCountryPage(this); addPage( countrypage, i18n( "Step 1: Introduction" ) ); - setHelpEnabled(QWizard::page(0), false); + setHelpEnabled(TQWizard::page(0), false); ospage= new KOSPage(this); addPage(ospage, i18n( "Step 2: I want it my Way..." ) ); - setHelpEnabled(QWizard::page(1), false); + setHelpEnabled(TQWizard::page(1), false); eyecandy= new KEyeCandyPage(this); addPage( eyecandy, i18n( "Step 3: Eyecandy-O-Meter" ) ); - setHelpEnabled(QWizard::page(2), false); + setHelpEnabled(TQWizard::page(2), false); stylepage= new KStylePage(this); addPage( stylepage, i18n( "Step 4: Everybody loves Themes" ) ); - setHelpEnabled(QWizard::page(3), false); + setHelpEnabled(TQWizard::page(3), false); refinepage=new KRefinePage(this); addPage( refinepage, i18n( "Step 5: Time to Refine" ) ); - setHelpEnabled(QWizard::page(4), false); + setHelpEnabled(TQWizard::page(4), false); cancelButton()->setText(i18n("S&kip Wizard")); - setFinishEnabled(QWizard::page(4), true); + setFinishEnabled(TQWizard::page(4), true); locale = new KLocale("kpersonalizer"); locale->setLanguage(KLocale::defaultLanguage()); - connect(ospage, SIGNAL(selectedOS(const QString&)), stylepage, SLOT(presetStyle(const QString&))); - connect(ospage, SIGNAL(selectedOS(const QString&)), eyecandy, SLOT(slotPresetSlider(const QString&))); - connect(refinepage->pb_kcontrol, SIGNAL(clicked()), this, SLOT(accept())); + 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())); setPosition(); @@ -114,23 +114,23 @@ void KPersonalizer::next() { delayedRestart(); } else { (void)countrypage->save(countrypage->cb_country, countrypage->cb_language); - QWizard::next(); + TQWizard::next(); } } else if(currentPage()==ospage){ os_dirty=true; // set the dirty flag, changes done that need reverting ospage->save(); - QWizard::next(); + TQWizard::next(); } else if(currentPage()==eyecandy){ eye_dirty=true; // set the dirty flag, changes done that need reverting eyecandy->save(); - QTimer::singleShot(0, this, SLOT(slotNext())); + TQTimer::singleShot(0, this, TQT_SLOT(slotNext())); } else if(currentPage()==stylepage){ style_dirty=true; // set the dirty flag, changes done that need reverting stylepage->save(); - QWizard::next(); + TQWizard::next(); } if(currentPage()==refinepage) { finishButton()->setFocus(); @@ -138,16 +138,16 @@ void KPersonalizer::next() { } void KPersonalizer::slotNext() { - QWizard::next(); + TQWizard::next(); stylepage->switchPrevStyle(); // We need to update the preview-widget, after the page changed } void KPersonalizer::back() { - QWizard::back(); + TQWizard::back(); } bool KPersonalizer::askClose(){ - QString text; + TQString text; if (currentPage()==countrypage) { text = i18n("

Are you sure you want to quit the Desktop Settings Wizard?

" "

The Desktop Settings Wizard helps you to configure the KDE desktop to your personal liking.

" @@ -166,7 +166,7 @@ bool KPersonalizer::askClose(){ } } -/** the cancel button is connected to the reject() slot of QDialog, +/** the cancel button is connected to the reject() slot of TQDialog, * so we have to reimplement this here to add a dialogbox to ask if we * really want to quit the wizard. */ @@ -176,7 +176,7 @@ void KPersonalizer::reject(){ } } -void KPersonalizer::closeEvent(QCloseEvent* e){ +void KPersonalizer::closeEvent(TQCloseEvent* e){ if ( askClose() ) exit(0); else @@ -215,7 +215,7 @@ void KPersonalizer::slotRestart() { } void KPersonalizer::delayedRestart() { - QTimer::singleShot(0, this, SLOT(slotRestart())); + TQTimer::singleShot(0, this, TQT_SLOT(slotRestart())); } /** this session is restarted, so we want to start with ospage */ @@ -230,13 +230,13 @@ void KPersonalizer::setBeforeSession(){ before_session = true; } -/** there seems to be a bug in QWizard, that makes this evil hack necessary */ +/** there seems to be a bug in TQWizard, that makes this evil hack necessary */ void KPersonalizer::setPosition() { - QSize hint = countrypage->sizeHint(); - QSize os_size = ospage->sizeHint(); - QSize candy_size = eyecandy->sizeHint(); - QSize style_size = stylepage->sizeHint(); - QSize refine_size = refinepage->sizeHint(); + TQSize hint = countrypage->sizeHint(); + TQSize os_size = ospage->sizeHint(); + TQSize candy_size = eyecandy->sizeHint(); + TQSize style_size = stylepage->sizeHint(); + TQSize refine_size = refinepage->sizeHint(); // get the width of the broadest child-widget if ( hint.width() < os_size.width() ) @@ -259,7 +259,7 @@ void KPersonalizer::setPosition() { hint.setHeight(refine_size.height()); // set the position - QRect rect = KGlobalSettings::desktopGeometry(QCursor::pos()); + TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos()); int w = rect.x() + (rect.width() - hint.width())/2 - 9; int h = rect.y() + (rect.height() - hint.height())/2; move(w, h); diff --git a/kpersonalizer/kpersonalizer.h b/kpersonalizer/kpersonalizer.h index 00bd5ed03..5eeb7907e 100644 --- a/kpersonalizer/kpersonalizer.h +++ b/kpersonalizer/kpersonalizer.h @@ -40,7 +40,7 @@ class KPersonalizer : public KWizard { Q_OBJECT public: /** construtor */ - KPersonalizer(QWidget* parent=0, const char *name=0); + KPersonalizer(TQWidget* parent=0, const char *name=0); /** destructor */ ~KPersonalizer(); @@ -57,7 +57,7 @@ public: public slots: // Public slots /** calls all save functions after resetting all features/ OS/ theme selections to KDE default */ void setDefaults(); - /** the cancel button is connected to the reject() slot of QDialog, + /** the cancel button is connected to the reject() slot of TQDialog, * so we have to reimplement this here to add a dialogbox to * ask if we really want to quit the wizard. */ @@ -66,7 +66,7 @@ public slots: // Public slots * Calls applySettings() to save the current selection. */ void accept(); - /** We need this to use it in a QTimer */ + /** We need this to use it in a TQTimer */ void slotNext(); private: @@ -89,7 +89,7 @@ protected slots: // Public slots protected: // Protected methods // the close button on the titlebar sets e->accept() which we donīt want. - virtual void closeEvent(QCloseEvent*); + virtual void closeEvent(TQCloseEvent*); bool askClose(); }; diff --git a/kpersonalizer/krefinepage.cpp b/kpersonalizer/krefinepage.cpp index ce748caa3..1c9a553c0 100644 --- a/kpersonalizer/krefinepage.cpp +++ b/kpersonalizer/krefinepage.cpp @@ -14,8 +14,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include -#include +#include +#include #include #include @@ -26,9 +26,9 @@ #include "kpersonalizer.h" -KRefinePage::KRefinePage(QWidget *parent, const char *name ) : KRefinePageDlg(parent,name) { +KRefinePage::KRefinePage(TQWidget *parent, const char *name ) : KRefinePageDlg(parent,name) { px_finishSidebar->setPixmap(UserIcon("step5.png")); - connect( pb_kcontrol, SIGNAL(clicked()), SLOT(startKControl()) ); + connect( pb_kcontrol, TQT_SIGNAL(clicked()), TQT_SLOT(startKControl()) ); if( KPersonalizer::beforeSession()) { pb_kcontrol->hide(); lb_kcontrol->hide(); diff --git a/kpersonalizer/krefinepage.h b/kpersonalizer/krefinepage.h index dda893b93..4065b5a28 100644 --- a/kpersonalizer/krefinepage.h +++ b/kpersonalizer/krefinepage.h @@ -27,7 +27,7 @@ class KRefinePage : public KRefinePageDlg { Q_OBJECT public: - KRefinePage(QWidget *parent=0, const char *name=0); + KRefinePage(TQWidget *parent=0, const char *name=0); ~KRefinePage(); public slots: // Public slots /** starts kcontrol via krun when the user presses the diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp index b634acaff..1323d94fe 100644 --- a/kpersonalizer/kstylepage.cpp +++ b/kpersonalizer/kstylepage.cpp @@ -16,14 +16,14 @@ ***************************************************************************/ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -43,7 +43,7 @@ #include "stylepreview.h" #include "kstylepage.h" -KStylePage::KStylePage(QWidget *parent, const char *name ) : KStylePageDlg(parent,name) { +KStylePage::KStylePage(TQWidget *parent, const char *name ) : KStylePageDlg(parent,name) { px_stylesSidebar->setPixmap(UserIcon("step4.png")); @@ -51,36 +51,36 @@ KStylePage::KStylePage(QWidget *parent, const char *name ) : KStylePageDlg(paren klv_styles->addColumn( i18n( "Description" ) ); klv_styles->setAllColumnsShowFocus(true); - kde = new QListViewItem( klv_styles); - kde->setText( 0, QPixmap::defaultDepth() > 8 ? i18n( "Plastik" ) : i18n( "Light" ) ); + kde = new TQListViewItem( klv_styles); + kde->setText( 0, TQPixmap::defaultDepth() > 8 ? i18n( "Plastik" ) : i18n( "Light" ) ); kde->setText( 1, i18n( "KDE default style" ) ); - classic = new QListViewItem( klv_styles); + classic = new TQListViewItem( klv_styles); classic->setText( 0, i18n( "KDE Classic" ) ); classic->setText( 1, i18n( "Classic KDE style" ) ); - keramik = new QListViewItem( klv_styles ); + keramik = new TQListViewItem( klv_styles ); keramik->setText( 0, i18n( "Keramik" ) ); keramik->setText( 1, i18n( "The previous default style" ) ); - cde = new QListViewItem( klv_styles); + cde = new TQListViewItem( klv_styles); cde->setText( 0, i18n( "Sunshine" ) ); cde->setText( 1, i18n( "A very common desktop" ) ); - win = new QListViewItem( klv_styles ); + win = new TQListViewItem( klv_styles ); win->setText( 0, i18n( "Redmond" ) ); win->setText( 1, i18n( "A style from the northwest of the USA" ) ); - platinum = new QListViewItem( klv_styles ); + platinum = new TQListViewItem( klv_styles ); platinum->setText( 0, i18n( "Platinum" ) ); platinum->setText( 1, i18n( "The platinum style" ) ); - connect(klv_styles, SIGNAL(selectionChanged()), - this, SLOT(slotCurrentChanged())); + connect(klv_styles, TQT_SIGNAL(selectionChanged()), + this, TQT_SLOT(slotCurrentChanged())); // Note: if the default is changed here it needs to be changed in kdebase/kwin/plugins.cpp // and kdebase/kwin/kcmkwin/kwindecoration/kwindecoration.cpp as well. - defaultKWinStyle = QPixmap::defaultDepth() > 8 ? "kwin_plastik" : "kwin_quartz"; + defaultKWinStyle = TQPixmap::defaultDepth() > 8 ? "kwin_plastik" : "kwin_quartz"; appliedStyle = NULL; getAvailability(); @@ -105,7 +105,7 @@ void KStylePage::save(bool curSettings){ /** save the widget-style */ void KStylePage::saveStyle(bool curSettings){ - QString style = curSettings ? currentStyle : origStyle; + TQString style = curSettings ? currentStyle : origStyle; KConfig cfg( "kdeglobals" ); cfg.setGroup("General"); cfg.writeEntry( "widgetStyle", style, true, true ); @@ -115,7 +115,7 @@ void KStylePage::saveStyle(bool curSettings){ /** save the KWin-style*/ void KStylePage::saveKWin(bool curSettings){ - QString kwin = origKWinStyle; + TQString kwin = origKWinStyle; if(curSettings) { KDesktopFile* kdf = 0L; KStandardDirs* kstd = KGlobal::dirs(); @@ -128,7 +128,7 @@ void KStylePage::saveKWin(bool curSettings){ else if (keramik->isSelected() && kwin_keramik_exist) kdf = new KDesktopFile(kstd->findResource("data", "kwin/keramik.desktop")); else if (kde->isSelected()) { - if (kwin_plastik_exist && (QColor::numBitPlanes() > 8)) + if (kwin_plastik_exist && (TQColor::numBitPlanes() > 8)) kdf = new KDesktopFile(kstd->findResource("data", "kwin/plastik.desktop")); else if (kwin_quartz_exist) kdf = new KDesktopFile(kstd->findResource("data", "kwin/quartz.desktop")); @@ -188,7 +188,7 @@ void KStylePage::saveColors(bool curSettings){ //////////////////////////////////////////////////// // KDE-1.x support KSimpleConfig *kconfig = - new KSimpleConfig( QDir::homeDirPath() + "/.kderc" ); + new KSimpleConfig( TQDir::homeDirPath() + "/.kderc" ); kconfig->setGroup( "General" ); kconfig->writeEntry("background", toSave->background ); kconfig->writeEntry("selectBackground", toSave->selectBackground ); @@ -218,16 +218,16 @@ void KStylePage::saveColors(bool curSettings){ /** save the icon-theme*/ void KStylePage::saveIcons(bool curSettings) { - QString theme = origIcons; + TQString theme = origIcons; if (curSettings) { if ( (kde->isSelected() || platinum->isSelected() || keramik->isSelected()) && icon_crystalsvg_exist) theme = "crystalsvg"; else if ( (classic->isSelected() || cde->isSelected() || win->isSelected()) - && (QColor::numBitPlanes() > 8) && icon_kdeclassic_exist) + && (TQColor::numBitPlanes() > 8) && icon_kdeclassic_exist) theme = "kdeclassic"; else if ( (classic->isSelected() || cde->isSelected() || win->isSelected()) - && (QColor::numBitPlanes() <= 8) && icon_Locolor_exist) + && (TQColor::numBitPlanes() <= 8) && icon_Locolor_exist) theme = "Locolor"; } // save, what we got @@ -238,7 +238,7 @@ void KStylePage::saveIcons(bool curSettings) { for (KIcon::Group i=KIcon::FirstGroup; isetGroup(QString::fromLatin1(groups[i]) + "Icons"); + KGlobal::config()->setGroup(TQString::fromLatin1(groups[i]) + "Icons"); KGlobal::config()->writeEntry("Size", icontheme.defaultSize(i)); } KGlobal::config()->sync(); @@ -270,7 +270,7 @@ void KStylePage::changeCurrentStyle() { } else if (classic->isSelected()) { // Use the highcolor style if the display supports it - if ( (QColor::numBitPlanes() > 8) && kde_hc_exist ) { + if ( (TQColor::numBitPlanes() > 8) && kde_hc_exist ) { currentStyle="HighColor"; } else if (kde_def_exist) { @@ -279,7 +279,7 @@ void KStylePage::changeCurrentStyle() { } else if (kde->isSelected()) { // Use the plastik style if the display supports it - if ( (QColor::numBitPlanes() > 8) && kde_plastik_exist ) { + if ( (TQColor::numBitPlanes() > 8) && kde_plastik_exist ) { currentStyle="Plastik"; } else if (kde_light_exist) { @@ -297,7 +297,7 @@ void KStylePage::changeCurrentStyle() { /** to be connected to the OS page. Catches * either KDE, CDE, win or mac and pre-sets the style. */ -void KStylePage::presetStyle(const QString& style){ +void KStylePage::presetStyle(const TQString& style){ kdDebug() << "KStylePage::presetStyle(): "<< style << endl; if(style=="KDE") { if (kde_plastik_exist) @@ -373,8 +373,8 @@ void KStylePage::getColors(colorSet *set, bool colorfile ){ kdesktop.setGroup("Desktop0"); // set Background (userSettings if available, else default) set->bgMode=kdesktop.readEntry("BackgroundMode", "Flat"); - QColor tmp1("#003082"); - QColor tmp2("#C0C0C0"); + TQColor tmp1("#003082"); + TQColor tmp2("#C0C0C0"); set->usrCol1=kdesktop.readColorEntry("Color1", &tmp1); set->usrCol2=kdesktop.readColorEntry("Color2", &tmp2); // write the color scheme filename and the contrast, default 7, otherwise from file @@ -416,8 +416,8 @@ void KStylePage::getAvailability() { // test, wich styles are available kde_keramik_exist = kde_hc_exist = kde_def_exist = cde_exist = kde_plastik_exist = win_exist = platinum_exist = false; - QStringList styles = QStyleFactory::keys(); - for (QStringList::iterator it = styles.begin(); it != styles.end(); it++) { + TQStringList styles = TQStyleFactory::keys(); + for (TQStringList::iterator it = styles.begin(); it != styles.end(); it++) { if (*it == "Keramik") kde_keramik_exist = true; else if (*it == "HighColor") kde_hc_exist = true; else if (*it == "Default") kde_def_exist = true; @@ -430,7 +430,7 @@ void KStylePage::getAvailability() { // and disable the ListItems, if they are not. if ( !(kde_plastik_exist || kde_light_exist) ) kde->setVisible(false); if ( !(kde_hc_exist || kde_def_exist) ) classic->setVisible(false); - if (!kde_keramik_exist || QPixmap::defaultDepth() <= 8) keramik->setVisible(false); + if (!kde_keramik_exist || TQPixmap::defaultDepth() <= 8) keramik->setVisible(false); if (!cde_exist) cde->setVisible(false); if (!win_exist) win->setVisible(false); if (!platinum_exist) platinum->setVisible(false); @@ -456,8 +456,8 @@ void KStylePage::getAvailability() { // check, wich Icon-themes are available icon_crystalsvg_exist = icon_kdeclassic_exist = icon_Locolor_exist = false; - QStringList icons(KIconTheme::list()); - for (QStringList::iterator it=icons.begin(); it != icons.end(); it++) { + TQStringList icons(KIconTheme::list()); + for (TQStringList::iterator it=icons.begin(); it != icons.end(); it++) { KIconTheme icontheme(*it); if (icontheme.isHidden() || !icontheme.isValid()) continue; if (*it == "crystalsvg") icon_crystalsvg_exist = true; @@ -502,7 +502,7 @@ void KStylePage::initColors() { inactiveTitleBtnBg.setRgb(167,181,199); alternateBackground.setRgb(237,244,249); - if (QPixmap::defaultDepth() > 8) + if (TQPixmap::defaultDepth() > 8) button.setRgb(221, 223, 228); else button.setRgb(220, 220, 220); @@ -529,16 +529,16 @@ void KStylePage::liveUpdate() { /** show the previewWidget styled with the selected one */ void KStylePage::switchPrevStyle() { - QStyle* style = QStyleFactory::create(currentStyle); + TQStyle* style = TQStyleFactory::create(currentStyle); if (!style) return; stylePreview->unsetPalette(); - QPalette palette = createPalette(); + TQPalette palette = createPalette(); style->polish(palette); stylePreview->setPalette(palette); // Prevent Qt from wrongly caching radio button images - QPixmapCache::clear(); + TQPixmapCache::clear(); // go ahead setStyleRecursive( stylePreview, palette, style ); // this flickers, but reliably draws the widgets corretly. @@ -548,37 +548,37 @@ void KStylePage::switchPrevStyle() { appliedStyle = style; } -void KStylePage::setStyleRecursive(QWidget* w, QPalette &palette, QStyle* s) { +void KStylePage::setStyleRecursive(TQWidget* w, TQPalette &palette, TQStyle* s) { // Apply the new style. w->setStyle(s); // Recursively update all children. - const QObjectList *children = w->children(); + const TQObjectList *children = w->children(); if (!children) return; // Apply the style to each child widget. - QPtrListIterator childit(*children); - QObject *child; + TQPtrListIterator childit(*children); + TQObject *child; while ((child = childit.current()) != 0) { ++childit; if (child->isWidgetType()) - setStyleRecursive((QWidget *) child, palette, s); + setStyleRecursive((TQWidget *) child, palette, s); } } -/** create a QPalette of our current colorset */ -QPalette KStylePage::createPalette() { +/** create a TQPalette of our current colorset */ +TQPalette KStylePage::createPalette() { colorSet *cc = ¤tColors; - QColorGroup disabledgrp(cc->windowForeground, cc->background, cc->background.light(150), + TQColorGroup disabledgrp(cc->windowForeground, cc->background, cc->background.light(150), cc->background.dark(), cc->background.dark(120), cc->background.dark(120), cc->windowBackground); - QColorGroup colgrp(cc->windowForeground, cc->background, cc->background.light(150), + TQColorGroup colgrp(cc->windowForeground, cc->background, cc->background.light(150), cc->background.dark(), cc->background.dark(120), cc->foreground, cc->windowBackground); - colgrp.setColor(QColorGroup::Highlight, cc->selectBackground); - colgrp.setColor(QColorGroup::HighlightedText, cc->selectForeground); - colgrp.setColor(QColorGroup::Button, cc->buttonBackground); - colgrp.setColor(QColorGroup::ButtonText, cc->buttonForeground); - return QPalette( colgrp, disabledgrp, colgrp); + colgrp.setColor(TQColorGroup::Highlight, cc->selectBackground); + colgrp.setColor(TQColorGroup::HighlightedText, cc->selectForeground); + colgrp.setColor(TQColorGroup::Button, cc->buttonBackground); + colgrp.setColor(TQColorGroup::ButtonText, cc->buttonForeground); + return TQPalette( colgrp, disabledgrp, colgrp); } #include "kstylepage.moc" diff --git a/kpersonalizer/kstylepage.h b/kpersonalizer/kstylepage.h index f017f5b99..0c6bf82b7 100644 --- a/kpersonalizer/kstylepage.h +++ b/kpersonalizer/kstylepage.h @@ -18,7 +18,7 @@ #ifndef KSTYLEPAGE_H #define KSTYLEPAGE_H -#include +#include #include "kstylepagedlg.h" /**Abstract class for the style page @@ -30,7 +30,7 @@ class KStylePage : public KStylePageDlg { Q_OBJECT public: - KStylePage(QWidget *parent=0, const char *name=0); + KStylePage(TQWidget *parent=0, const char *name=0); ~KStylePage(); void save(bool curSettings=true); /** resets to KDE style as default */ @@ -39,58 +39,58 @@ public: void switchPrevStyle(); private: - QString origStyle; - QString origKWinStyle; - QString origIcons; - QString defaultKWinStyle; - QString currentStyle; + TQString origStyle; + TQString origKWinStyle; + TQString origIcons; + TQString defaultKWinStyle; + TQString currentStyle; KConfig* ckwin; struct colorSet { - QString colorFile, bgMode; + TQString colorFile, bgMode; int contrast; - QColor usrCol1, usrCol2; - QColor foreground; - QColor background; - QColor windowForeground; - QColor windowBackground; - QColor selectForeground; - QColor selectBackground; - QColor buttonForeground; - QColor buttonBackground; - QColor linkColor; - QColor visitedLinkColor; - QColor activeForeground; - QColor inactiveForeground; - QColor activeBackground; - QColor inactiveBackground; - QColor activeBlend; - QColor inactiveBlend; - QColor activeTitleBtnBg; - QColor inactiveTitleBtnBg; - QColor alternateBackground; + TQColor usrCol1, usrCol2; + TQColor foreground; + TQColor background; + TQColor windowForeground; + TQColor windowBackground; + TQColor selectForeground; + TQColor selectBackground; + TQColor buttonForeground; + TQColor buttonBackground; + TQColor linkColor; + TQColor visitedLinkColor; + TQColor activeForeground; + TQColor inactiveForeground; + TQColor activeBackground; + TQColor inactiveBackground; + TQColor activeBlend; + TQColor inactiveBlend; + TQColor activeTitleBtnBg; + TQColor inactiveTitleBtnBg; + TQColor alternateBackground; } usrColors, currentColors; // first, the KDE 2 default color values - QColor widget; - QColor kde34Blue; - QColor inactiveBackground; - QColor activeBackground; - QColor button; - QColor link; - QColor visitedLink; - QColor activeBlend; - QColor activeTitleBtnBg; - QColor inactiveTitleBtnBg; - QColor inactiveForeground; - QColor alternateBackground; - - QListViewItem * kde; - QListViewItem * classic; - QListViewItem * keramik; - QListViewItem * cde; - QListViewItem * win; - QListViewItem * platinum; - - QStyle *appliedStyle; + TQColor widget; + TQColor kde34Blue; + TQColor inactiveBackground; + TQColor activeBackground; + TQColor button; + TQColor link; + TQColor visitedLink; + TQColor activeBlend; + TQColor activeTitleBtnBg; + TQColor inactiveTitleBtnBg; + TQColor inactiveForeground; + TQColor alternateBackground; + + TQListViewItem * kde; + TQListViewItem * classic; + TQListViewItem * keramik; + TQListViewItem * cde; + TQListViewItem * win; + TQListViewItem * platinum; + + TQStyle *appliedStyle; // widget-style existence bool kde_hc_exist, kde_def_exist, kde_keramik_exist, kde_light_exist, @@ -105,7 +105,7 @@ private: public slots: // Public slots /** to be connected to the OS page. Catches either KDE, CDE, win or mac and pre-sets the style. */ - void presetStyle(const QString& style); + void presetStyle(const TQString& style); private: void saveColors(bool curSettings=true); @@ -117,9 +117,9 @@ private: void initColors(); void liveUpdate(); void getColors(colorSet *set, bool colorfile ); - void setStyleRecursive(QWidget* w, QPalette &, QStyle* s); + void setStyleRecursive(TQWidget* w, TQPalette &, TQStyle* s); void changeCurrentStyle(); - QPalette createPalette(); + TQPalette createPalette(); private slots: void slotCurrentChanged(); diff --git a/kpersonalizer/ksysinfo.cpp b/kpersonalizer/ksysinfo.cpp index a16c707be..20a089b8f 100644 --- a/kpersonalizer/ksysinfo.cpp +++ b/kpersonalizer/ksysinfo.cpp @@ -19,10 +19,10 @@ * Code partly taken from kcontrol/info and kcontrol/fonts */ -#include -#include -#include -#include +#include +#include +#include +#include #include @@ -31,7 +31,7 @@ #include "ksysinfo.h" KSysInfo::KSysInfo() { - m_fdb = new QFontDatabase(); + m_fdb = new TQFontDatabase(); initXInfo(); initFontFamilies(); initHWInfo(); @@ -55,7 +55,7 @@ KSysInfo::~KSysInfo() { void KSysInfo::initXInfo() { Display *dpy = XOpenDisplay(0); // vendor - m_xvendor = !dpy ? QString::null : (QString)ServerVendor(dpy); + m_xvendor = !dpy ? TQString::null : (TQString)ServerVendor(dpy); // XFree-Inc? m_xfree_inc = m_xvendor.contains("XFree86"); // X.org ? @@ -65,10 +65,10 @@ void KSysInfo::initXInfo() { // RENDER-support m_xrender = false; int extCount; - QString extension; + TQString extension; char **extensions = XListExtensions( dpy, &extCount ); for (int i = 0; i < extCount; i++ ) { - extension=QString( extensions[i] ); + extension=TQString( extensions[i] ); extension=extension.stripWhiteSpace(); if (!extension.compare("RENDER")) m_xrender=true; @@ -98,13 +98,13 @@ bool KSysInfo::getRenderSupport(){ */ void KSysInfo::initFontFamilies() { - QFontDatabase fdb; - QStringList families = fdb.families(); - m_normal_font = QString::null; - m_fixed_font = QString::null; + TQFontDatabase fdb; + TQStringList families = fdb.families(); + 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++) { - QString font = *families.at(i); + TQString font = *families.at(i); //add further NORMAL fonts here if ( (font.contains("Arial [") || font=="Arial") && normal_priority < 15 ) { m_normal_font = font; @@ -154,19 +154,19 @@ void KSysInfo::initFontFamilies() { } } -QFont KSysInfo::getNormalFont() { +TQFont KSysInfo::getNormalFont() { return m_fdb->font(m_normal_font,"Normal",12); // this will return the current font, if !m_normal_font } -QFont KSysInfo::getSmallFont(){ +TQFont KSysInfo::getSmallFont(){ return m_fdb->font(m_normal_font,"Normal",11); } -QFont KSysInfo::getBoldFont(){ +TQFont KSysInfo::getBoldFont(){ return m_fdb->font(m_normal_font,"Bold",12); } -QFont KSysInfo::getFixedWidthFont(){ +TQFont KSysInfo::getFixedWidthFont(){ return m_fdb->font(m_fixed_font,"Normal",10); } @@ -179,12 +179,12 @@ QFont KSysInfo::getFixedWidthFont(){ #ifdef __linux__ /////////////////// - #include + #include #include void KSysInfo::initHWInfo() { char buf[512]; - QFile *file = new QFile("/proc/cpuinfo"); + TQFile *file = new TQFile("/proc/cpuinfo"); m_cpu_speed = 0; @@ -200,8 +200,8 @@ QFont KSysInfo::getFixedWidthFont(){ // File Parser while (file->readLine(buf, sizeof(buf) - 1) > 0) { - QString s1 = QString::fromLocal8Bit(buf); - QString s2 = s1.mid(s1.find(":") + 1); + TQString s1 = TQString::fromLocal8Bit(buf); + TQString s2 = s1.mid(s1.find(":") + 1); s1.truncate(s1.find(":")); s1=s1.stripWhiteSpace(); s2=s2.stripWhiteSpace(); diff --git a/kpersonalizer/ksysinfo.h b/kpersonalizer/ksysinfo.h index 2d6fcddb8..a78051578 100644 --- a/kpersonalizer/ksysinfo.h +++ b/kpersonalizer/ksysinfo.h @@ -32,10 +32,10 @@ public: int getXRelease(); bool getRenderSupport(); /* font - info */ - QFont getNormalFont(); - QFont getSmallFont(); - QFont getBoldFont(); - QFont getFixedWidthFont(); + TQFont getNormalFont(); + TQFont getSmallFont(); + TQFont getBoldFont(); + TQFont getFixedWidthFont(); /* Hardware - info */ int getCpuSpeed(); private: @@ -44,15 +44,15 @@ private: void initHWInfo(); private: /* XServer - info */ - QString m_xvendor; + TQString m_xvendor; bool m_xfree_inc; bool m_xorg; int m_xrelease; bool m_xrender; /* font - info */ - QFontDatabase* m_fdb; - QString m_normal_font; - QString m_fixed_font; + TQFontDatabase* m_fdb; + TQString m_normal_font; + TQString m_fixed_font; /* Hardware - info */ int m_cpu_speed; }; diff --git a/kpersonalizer/stylepreview.ui.h b/kpersonalizer/stylepreview.ui.h index 6bd47d62a..d073ddc34 100644 --- a/kpersonalizer/stylepreview.ui.h +++ b/kpersonalizer/stylepreview.ui.h @@ -27,7 +27,7 @@ ** a constructor, and a destroy() slot in place of a destructor. *****************************************************************************/ -#include +#include #ifdef KeyPress #undef KeyPress @@ -41,32 +41,32 @@ void StylePreview::init() { // Ensure that the user can't toy with the child widgets. // Method borrowed from Qt's qtconfig. - QObjectList* l = queryList("QWidget"); - QObjectListIt it(*l); - QObject* obj; + TQObjectList* l = queryList("TQWidget"); + TQObjectListIt it(*l); + TQObject* obj; while ((obj = it.current()) != 0) { ++it; obj->installEventFilter(this); - ((QWidget*)obj)->setFocusPolicy(NoFocus); + ((TQWidget*)obj)->setFocusPolicy(NoFocus); } delete l; } -bool StylePreview::eventFilter( QObject* /* obj */, QEvent* ev ) +bool StylePreview::eventFilter( TQObject* /* obj */, TQEvent* ev ) { switch( ev->type() ) { - case QEvent::MouseButtonPress: - case QEvent::MouseButtonRelease: - case QEvent::MouseButtonDblClick: - case QEvent::MouseMove: - case QEvent::KeyPress: - case QEvent::KeyRelease: - case QEvent::Enter: - case QEvent::Leave: - case QEvent::Wheel: - case QEvent::ContextMenu: + case TQEvent::MouseButtonPress: + case TQEvent::MouseButtonRelease: + case TQEvent::MouseButtonDblClick: + case TQEvent::MouseMove: + case TQEvent::KeyPress: + case TQEvent::KeyRelease: + case TQEvent::Enter: + case TQEvent::Leave: + case TQEvent::Wheel: + case TQEvent::ContextMenu: return TRUE; // ignore default: break; -- cgit v1.2.3