From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:43:14 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kpersonalizer/kcountrypage.cpp | 12 ++--- kpersonalizer/keyecandypage.cpp | 112 ++++++++++++++++++++-------------------- kpersonalizer/kfindlanguage.cpp | 4 +- kpersonalizer/kospage.cpp | 2 +- kpersonalizer/kpersonalizer.cpp | 2 +- kpersonalizer/krefinepage.cpp | 2 +- kpersonalizer/kstylepage.cpp | 30 +++++------ kpersonalizer/main.cpp | 2 +- 8 files changed, 83 insertions(+), 83 deletions(-) (limited to 'kpersonalizer') diff --git a/kpersonalizer/kcountrypage.cpp b/kpersonalizer/kcountrypage.cpp index 71e58ce39..eb4b5da91 100644 --- a/kpersonalizer/kcountrypage.cpp +++ b/kpersonalizer/kcountrypage.cpp @@ -50,7 +50,7 @@ KCountryPage::KCountryPage(TQWidget *parent, const char *name ) : KCountryPageDl flang = new KFindLanguage(); // need this ones for decision over restarts of kp, kicker, etc - s_oldlocale = KGlobal::locale()->language(); + s_oldlocale = TDEGlobal::locale()->language(); // load the Menus and guess the selection loadCountryList(cb_country); @@ -81,7 +81,7 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) { // clear the list combo->clear(); - TQStringList regionfiles = KGlobal::dirs()->findAllResources("locale", sub + "*.desktop"); + TQStringList regionfiles = TDEGlobal::dirs()->findAllResources("locale", sub + "*.desktop"); TQMap regionnames; for ( TQStringList::ConstIterator it = regionfiles.begin(); it != regionfiles.end(); ++it ) { @@ -108,7 +108,7 @@ void KCountryPage::loadCountryList(KLanguageButton *combo) { } // add all languages to the list - TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + "*/entry.desktop"); + TQStringList countrylist = TDEGlobal::dirs()->findAllResources("locale", sub + "*/entry.desktop"); countrylist.sort(); for ( TQStringList::ConstIterator it = countrylist.begin(); it != countrylist.end(); ++it ) { @@ -149,7 +149,7 @@ void KCountryPage::fillLanguageMenu(KLanguageButton *combo) { /** No descriptions */ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLang) { kdDebug() << "KCountryPage::save()" << endl; - KConfigBase *config = KGlobal::config(); + KConfigBase *config = TDEGlobal::config(); config->setGroup(TQString::fromLatin1("Locale")); config->writeEntry(TQString::fromLatin1("Country"), comboCountry->current(), true, true); @@ -166,9 +166,9 @@ bool KCountryPage::save(KLanguageButton *comboCountry, KLanguageButton *comboLan if ( !kapp->dcopClient()->isAttached() ) kapp->dcopClient()->attach(); // ksycoca needs to be rebuilt - KProcess proc; + TDEProcess proc; proc << TQString::fromLatin1("kbuildsycoca"); - proc.start(KProcess::DontCare); + proc.start(TDEProcess::DontCare); kdDebug() << "KLocaleConfig::save : sending signal to kdesktop" << endl; // inform kicker and kdeskop about the new language kapp->dcopClient()->send( "kicker", "Panel", "restart()", TQString::null); diff --git a/kpersonalizer/keyecandypage.cpp b/kpersonalizer/keyecandypage.cpp index 9032e824f..4aecabc6e 100644 --- a/kpersonalizer/keyecandypage.cpp +++ b/kpersonalizer/keyecandypage.cpp @@ -324,23 +324,23 @@ void KEyeCandyPage::enableDesktopWindowMovingContents(bool enable, bool restore) // see /tdebase/kcontrol/kwm module, KAdvancedConfig class. Used are: // -Display content in moving window // -Display content in resizing window -// And KGlobalSettings::opaqueResize() for QSplitters +// And TDEGlobalSettings::opaqueResize() for QSplitters twinconf->setGroup( "Windows" ); - KGlobal::config()->setGroup("KDE"); + TDEGlobal::config()->setGroup("KDE"); if (enable){ twinconf->writeEntry("ResizeMode","Opaque"); twinconf->writeEntry("MoveMode","Opaque"); - KGlobal::config()->writeEntry("OpaqueResize", true, true, true); + TDEGlobal::config()->writeEntry("OpaqueResize", true, true, true); } else { twinconf->writeEntry("ResizeMode","Transparent"); twinconf->writeEntry("MoveMode","Transparent"); - KGlobal::config()->writeEntry("OpaqueResize", false, true, true); + TDEGlobal::config()->writeEntry("OpaqueResize", false, true, true); } if(restore){ twinconf->writeEntry("ResizeMode",s_ResizeMode); twinconf->writeEntry("MoveMode",s_MoveMode); - KGlobal::config()->writeEntry("OpaqueResize", b_OpaqueResize, true, true); + TDEGlobal::config()->writeEntry("OpaqueResize", b_OpaqueResize, true, true); } } @@ -378,32 +378,32 @@ void KEyeCandyPage::enableIconZoomingPanel(bool enable){ /** enable Icon highlighting, Level 3 */ void KEyeCandyPage::enableIconEffectGamma(bool enable, bool user){ if(enable){ - KGlobal::config()->setGroup("DesktopIcons"); - KGlobal::config()->writeEntry("ActiveEffect", "togamma", true, true); - KGlobal::config()->writeEntry("ActiveValue", "0.7", true, true); - KGlobal::config()->setGroup("PanelIcons"); - KGlobal::config()->writeEntry("ActiveEffect", "togamma", true, true); - KGlobal::config()->writeEntry("ActiveValue", "0.7", true, true); + TDEGlobal::config()->setGroup("DesktopIcons"); + TDEGlobal::config()->writeEntry("ActiveEffect", "togamma", true, true); + TDEGlobal::config()->writeEntry("ActiveValue", "0.7", true, true); + TDEGlobal::config()->setGroup("PanelIcons"); + TDEGlobal::config()->writeEntry("ActiveEffect", "togamma", true, true); + TDEGlobal::config()->writeEntry("ActiveValue", "0.7", true, true); } else { if(user){ - KGlobal::config()->setGroup("DesktopIcons"); - KGlobal::config()->writeEntry("ActiveEffect", st_UserGamma.EffectDesktop, true, true); - KGlobal::config()->writeEntry("ActiveValue", st_UserGamma.ValueDesktop, true, true); - KGlobal::config()->setGroup("PanelIcons"); - KGlobal::config()->writeEntry("ActiveEffect", st_UserGamma.EffectPanel, true, true); - KGlobal::config()->writeEntry("ActiveValue", st_UserGamma.ValuePanel, true, true); + TDEGlobal::config()->setGroup("DesktopIcons"); + TDEGlobal::config()->writeEntry("ActiveEffect", st_UserGamma.EffectDesktop, true, true); + TDEGlobal::config()->writeEntry("ActiveValue", st_UserGamma.ValueDesktop, true, true); + TDEGlobal::config()->setGroup("PanelIcons"); + TDEGlobal::config()->writeEntry("ActiveEffect", st_UserGamma.EffectPanel, true, true); + TDEGlobal::config()->writeEntry("ActiveValue", st_UserGamma.ValuePanel, true, true); } else { - KGlobal::config()->setGroup("DesktopIcons"); - KGlobal::config()->writeEntry("ActiveEffect", "none", true, true); - KGlobal::config()->setGroup("PanelIcons"); - KGlobal::config()->writeEntry("ActiveEffect", "none", true, true); + TDEGlobal::config()->setGroup("DesktopIcons"); + TDEGlobal::config()->writeEntry("ActiveEffect", "none", true, true); + TDEGlobal::config()->setGroup("PanelIcons"); + TDEGlobal::config()->writeEntry("ActiveEffect", "none", true, true); } } } void KEyeCandyPage::enableIconMngAnimation(bool enable) { - KGlobal::config()->setGroup("DesktopIcons"); - KGlobal::config()->writeEntry("Animated", enable, true, true); + TDEGlobal::config()->setGroup("DesktopIcons"); + TDEGlobal::config()->writeEntry("Animated", enable, true, true); } /** No descriptions */ @@ -421,11 +421,11 @@ void KEyeCandyPage::enableIconEffectSizePanel(bool enable){ /** No descriptions */ void KEyeCandyPage::enableIconEffectSizeDesktop(bool enable){ - KGlobal::config()->setGroup("DesktopIcons"); + TDEGlobal::config()->setGroup("DesktopIcons"); if( enable ) { // use 48x48 icons - KGlobal::config()->writeEntry("Size", 48, true, true); + TDEGlobal::config()->writeEntry("Size", 48, true, true); } else { - KGlobal::config()->writeEntry("Size", desktopiconsize, true, true); + TDEGlobal::config()->writeEntry("Size", desktopiconsize, true, true); } } //----------------------------ICON STUFF------------------------------------------------- @@ -435,33 +435,33 @@ void KEyeCandyPage::enableIconEffectSizeDesktop(bool enable){ /** Enable fading tooltips in Level 7 */ void KEyeCandyPage::enableFadingToolTips(bool enable){ - KGlobal::config()->setGroup("KDE"); - KGlobal::config()->writeEntry( "EffectFadeTooltip", enable, true, true); + TDEGlobal::config()->setGroup("KDE"); + TDEGlobal::config()->writeEntry( "EffectFadeTooltip", enable, true, true); } /** enables/disables fading menus which are off by default in KDE. Enable this in Level 9 */ void KEyeCandyPage::enableFadingMenus(bool enable){ - KGlobal::config()->setGroup("KDE"); - KGlobal::config()->writeEntry("EffectFadeMenu", enable,true, true); + TDEGlobal::config()->setGroup("KDE"); + TDEGlobal::config()->writeEntry("EffectFadeMenu", enable,true, true); } /** enables/disables icons on pushbuttons, which are off by default in KDE. Enable this in Level 5 */ void KEyeCandyPage::enablePushButtonIcons(bool enable){ - KGlobal::config()->setGroup("KDE"); - KGlobal::config()->writeEntry("ShowIconsOnPushButtons", enable,true, true); + TDEGlobal::config()->setGroup("KDE"); + TDEGlobal::config()->writeEntry("ShowIconsOnPushButtons", enable,true, true); } /** Enable animated combo boxes, see styles kcontrol module. Enable in Level 6 (disabled by default anyway, so doesn't need to be disabled in levels below 4) */ void KEyeCandyPage::enableAnimatedCombo(bool enable){ - KGlobal::config()->setGroup("KDE"); - KGlobal::config()->writeEntry("EffectAnimateCombo", enable, true, true); + TDEGlobal::config()->setGroup("KDE"); + TDEGlobal::config()->writeEntry("EffectAnimateCombo", enable, true, true); } /** generally enable/disable style-Effects, depending on if one of the three is enabled. */ void KEyeCandyPage::enableEffects(bool enable){ - KGlobal::config()->setGroup("KDE"); - KGlobal::config()->writeEntry("EffectsEnabled", enable, true, true); + TDEGlobal::config()->setGroup("KDE"); + TDEGlobal::config()->writeEntry("EffectsEnabled", enable, true, true); } //----------------------------STYLE EFFECTS------------------------------------------------- @@ -621,7 +621,7 @@ void KEyeCandyPage::save(bool currSettings){ konqiconconf->sync(); kickerconf->sync(); kdesktopconf->sync(); - KGlobal::config()->sync(); + TDEGlobal::config()->sync(); // restart twin for window effects kapp->dcopClient()->send("knotify", "Notify", "reconfigure()", TQString("")); kapp->dcopClient()->send("twin*", "", "reconfigure()", TQString("")); @@ -683,7 +683,7 @@ void KEyeCandyPage::getUserDefaults(){ // Wallpaper-User-Defaults kdesktopconf->setGroup("FMSettings"); - TQColor tempcolor=KGlobalSettings::textColor(); + TQColor tempcolor=TDEGlobalSettings::textColor(); desktopTextColor = kdesktopconf->readColorEntry("NormalTextColor", &tempcolor ); kdesktopconf->setGroup("Background Common"); st_UserWallpaper.CommonDesktop = kdesktopconf->readBoolEntry("CommonDesktop", true); @@ -694,29 +694,29 @@ void KEyeCandyPage::getUserDefaults(){ deskbgimage = kdesktopconf->readPathEntry("Wallpaper", DEFAULT_WALLPAPER); // Wallpaper-User-Defaults (END) - KGlobal::config()->setGroup("KDE"); + TDEGlobal::config()->setGroup("KDE"); // Font-User-Defaults b_useXft=TQSettings().readBoolEntry("/qt/useXft"); b_enableXft=TQSettings().readBoolEntry("/qt/enableXft"); - KGlobal::config()->setGroup("PanelIcons"); - st_UserGamma.EffectPanel=KGlobal::config()->readEntry("ActiveEffect", "none"); - st_UserGamma.ValuePanel=KGlobal::config()->readEntry("ActiveValue", "0.7"); - - KGlobal::config()->setGroup("DesktopIcons"); - st_UserGamma.EffectDesktop=KGlobal::config()->readEntry("ActiveEffect", "none"); - st_UserGamma.ValueDesktop=KGlobal::config()->readEntry("ActiveValue", "0.7"); - desktopiconsize=KGlobal::config()->readNumEntry("Size", 32); - b_iconMngAnim = KGlobal::config()->readBoolEntry( "Animated", true ); - - KGlobal::config()->setGroup("KDE"); - b_EffectFadeTooltip=KGlobal::config()->readBoolEntry( "EffectFadeTooltip", false ); - b_PushButtonIcons=KGlobal::config()->readBoolEntry("ShowIconsOnPushButtons", false); - b_EffectFadeMenu=KGlobal::config()->readBoolEntry("EffectFadeMenu", false); - b_EffectAnimateCombo=KGlobal::config()->readBoolEntry("EffectAnimateCombo", false); - b_EffectsEnabled=KGlobal::config()->readBoolEntry("EffectsEnabled", false); - b_OpaqueResize=KGlobal::config()->readBoolEntry("OpaqueResize", true); + TDEGlobal::config()->setGroup("PanelIcons"); + st_UserGamma.EffectPanel=TDEGlobal::config()->readEntry("ActiveEffect", "none"); + st_UserGamma.ValuePanel=TDEGlobal::config()->readEntry("ActiveValue", "0.7"); + + TDEGlobal::config()->setGroup("DesktopIcons"); + st_UserGamma.EffectDesktop=TDEGlobal::config()->readEntry("ActiveEffect", "none"); + st_UserGamma.ValueDesktop=TDEGlobal::config()->readEntry("ActiveValue", "0.7"); + desktopiconsize=TDEGlobal::config()->readNumEntry("Size", 32); + b_iconMngAnim = TDEGlobal::config()->readBoolEntry( "Animated", true ); + + TDEGlobal::config()->setGroup("KDE"); + b_EffectFadeTooltip=TDEGlobal::config()->readBoolEntry( "EffectFadeTooltip", false ); + b_PushButtonIcons=TDEGlobal::config()->readBoolEntry("ShowIconsOnPushButtons", false); + b_EffectFadeMenu=TDEGlobal::config()->readBoolEntry("EffectFadeMenu", false); + b_EffectAnimateCombo=TDEGlobal::config()->readBoolEntry("EffectAnimateCombo", false); + b_EffectsEnabled=TDEGlobal::config()->readBoolEntry("EffectsEnabled", false); + b_OpaqueResize=TDEGlobal::config()->readBoolEntry("OpaqueResize", true); kickerconf->setGroup("buttons"); b_EnableIconZoom=kickerconf->readBoolEntry("EnableIconZoom", true); diff --git a/kpersonalizer/kfindlanguage.cpp b/kpersonalizer/kfindlanguage.cpp index a23f98322..b0c390395 100644 --- a/kpersonalizer/kfindlanguage.cpp +++ b/kpersonalizer/kfindlanguage.cpp @@ -29,7 +29,7 @@ #include "kfindlanguage.h" KFindLanguage::KFindLanguage() { - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup("Locale"); m_oldlang = config->readEntry("Language"); @@ -69,7 +69,7 @@ KFindLanguage::KFindLanguage() { } // add all languages to the list - TQStringList alllang = KGlobal::dirs()->findAllResources("locale", "*/entry.desktop", false, true); + TQStringList alllang = TDEGlobal::dirs()->findAllResources("locale", "*/entry.desktop", false, true); alllang.sort(); TQStringList langlist = prilang; if (langlist.count() > 0) diff --git a/kpersonalizer/kospage.cpp b/kpersonalizer/kospage.cpp index 111716a97..401016d24 100644 --- a/kpersonalizer/kospage.cpp +++ b/kpersonalizer/kospage.cpp @@ -105,7 +105,7 @@ void KOSPage::save(bool currSettings){ void KOSPage::saveCheckState(bool currSettings){ if(currSettings){ // Set the path for the keysscheme resource files - KGlobal::dirs()->addResourceType("keys", KStandardDirs::kde_default("data")+"kcmkeys"); + TDEGlobal::dirs()->addResourceType("keys", KStandardDirs::kde_default("data")+"kcmkeys"); // write the settings to the configfiles, depending on wich radiobutton is checked if(rb_kde->isChecked()){ writeKDE(); diff --git a/kpersonalizer/kpersonalizer.cpp b/kpersonalizer/kpersonalizer.cpp index e28848cc0..2ad4a486b 100644 --- a/kpersonalizer/kpersonalizer.cpp +++ b/kpersonalizer/kpersonalizer.cpp @@ -259,7 +259,7 @@ void KPersonalizer::setPosition() { hint.setHeight(refine_size.height()); // set the position - TQRect rect = KGlobalSettings::desktopGeometry(TQCursor::pos()); + TQRect rect = TDEGlobalSettings::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/krefinepage.cpp b/kpersonalizer/krefinepage.cpp index 1c9a553c0..d6038deae 100644 --- a/kpersonalizer/krefinepage.cpp +++ b/kpersonalizer/krefinepage.cpp @@ -33,7 +33,7 @@ KRefinePage::KRefinePage(TQWidget *parent, const char *name ) : KRefinePageDlg(p pb_kcontrol->hide(); lb_kcontrol->hide(); } - px_kcontrol->setPixmap(KGlobal::iconLoader()->loadIcon("kcontrol", KIcon::Panel, KIcon::SizeMedium)); + px_kcontrol->setPixmap(TDEGlobal::iconLoader()->loadIcon("kcontrol", KIcon::Panel, KIcon::SizeMedium)); } KRefinePage::~KRefinePage(){ } diff --git a/kpersonalizer/kstylepage.cpp b/kpersonalizer/kstylepage.cpp index c9d511ab2..1c48dd6c9 100644 --- a/kpersonalizer/kstylepage.cpp +++ b/kpersonalizer/kstylepage.cpp @@ -118,7 +118,7 @@ void KStylePage::saveKWin(bool curSettings){ TQString twin = origKWinStyle; if(curSettings) { KDesktopFile* kdf = 0L; - KStandardDirs* kstd = KGlobal::dirs(); + KStandardDirs* kstd = TDEGlobal::dirs(); if (cde->isSelected() && twin_cde_exist) kdf = new KDesktopFile(kstd->findResource("data", "twin/cde.desktop")); else if (win->isSelected() && twin_win_exist) @@ -160,7 +160,7 @@ void KStylePage::saveColors(bool curSettings){ // the GLOBAL config entries must be taken from the kcsrc file and written to it. Use the default values // equals that the file is which is no file. TODO: use the default values in that case (kde selected) - KConfig *config = KGlobal::config(); + KConfig *config = TDEGlobal::config(); config->setGroup( "General" ); config->writeEntry("foreground", toSave->foreground, true, true); config->writeEntry("background", toSave->background, true, true); @@ -173,7 +173,7 @@ void KStylePage::saveColors(bool curSettings){ config->writeEntry("linkColor", toSave->linkColor, true, true); config->writeEntry("visitedLinkColor", toSave->visitedLinkColor, true, true); - // set to the WM group, *only* the KGlobal one, a kcsrc file only has the group "Color Scheme" hmpf... + // set to the WM group, *only* the TDEGlobal one, a kcsrc file only has the group "Color Scheme" hmpf... config->setGroup( "WM" ); config->writeEntry("activeForeground", toSave->activeForeground, true, true); config->writeEntry("inactiveForeground", toSave->inactiveForeground, true, true); @@ -231,17 +231,17 @@ void KStylePage::saveIcons(bool curSettings) { theme = "Locolor"; } // save, what we got - KGlobal::config()->setGroup("Icons"); - KGlobal::config()->writeEntry("Theme", theme, true, true); + TDEGlobal::config()->setGroup("Icons"); + TDEGlobal::config()->writeEntry("Theme", theme, true, true); KIconTheme icontheme(theme); const char * const groups[] = { "Desktop", "Toolbar", "MainToolbar", "Small", 0L }; for (KIcon::Group i=KIcon::FirstGroup; isetGroup(TQString::fromLatin1(groups[i]) + "Icons"); - KGlobal::config()->writeEntry("Size", icontheme.defaultSize(i)); + TDEGlobal::config()->setGroup(TQString::fromLatin1(groups[i]) + "Icons"); + TDEGlobal::config()->writeEntry("Size", icontheme.defaultSize(i)); } - KGlobal::config()->sync(); + TDEGlobal::config()->sync(); kdDebug() << "KStylePage::saveIcons(): " << theme << endl; } @@ -324,7 +324,7 @@ void KStylePage::getColors(colorSet *set, bool colorfile ){ bool deleteConfig = false; // get the color scheme file and go to the color scheme group if(colorfile){ - KGlobal::dirs()->addResourceType("colors", KStandardDirs::kde_default("data")+"kdisplay/color-schemes"); + TDEGlobal::dirs()->addResourceType("colors", KStandardDirs::kde_default("data")+"kdisplay/color-schemes"); // set the style if (kde->isSelected()) { set->bgMode="Flat"; @@ -378,7 +378,7 @@ void KStylePage::getColors(colorSet *set, bool colorfile ){ 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 - config=KGlobal::config(); + config=TDEGlobal::config(); config->setGroup("KDE"); set->colorFile=config->readEntry("colorScheme", ""); set->contrast=config->readNumEntry("contrast", 7); @@ -439,7 +439,7 @@ void KStylePage::getAvailability() { twin_keramik_exist = twin_system_exist = twin_plastik_exist = twin_default_exist = twin_win_exist = twin_cde_exist = twin_quartz_exist = false; - KStandardDirs* kstd = KGlobal::dirs(); + KStandardDirs* kstd = TDEGlobal::dirs(); if (!kstd->findResource("data", "twin/keramik.desktop").isNull()) twin_keramik_exist = true; if (!kstd->findResource("data", "twin/plastik.desktop").isNull()) @@ -469,8 +469,8 @@ void KStylePage::getAvailability() { /** get the user's former settings */ void KStylePage::getUserDefaults() { // Get the user's current widget-style - KGlobal::config()->setGroup("General"); - origStyle = KGlobal::config()->readEntry( "widgetStyle", KStyle::defaultStyle() ); + TDEGlobal::config()->setGroup("General"); + origStyle = TDEGlobal::config()->readEntry( "widgetStyle", KStyle::defaultStyle() ); // get the user's current KWin-style ctwin = new KConfig("twinrc"); @@ -481,8 +481,8 @@ void KStylePage::getUserDefaults() { getColors(&usrColors, false); // Get the user's current iconset - KGlobal::config()->setGroup("Icons"); - origIcons = KGlobal::config()->readEntry("Theme"); + TDEGlobal::config()->setGroup("Icons"); + origIcons = TDEGlobal::config()->readEntry("Theme"); kdDebug() << "KStylePage::getUserDefaults(): style: " << origStyle << endl; kdDebug() << "KStylePage::getUserDefaults(): KWinStyle: " << origKWinStyle << endl; diff --git a/kpersonalizer/main.cpp b/kpersonalizer/main.cpp index 2916302fa..8923381a8 100644 --- a/kpersonalizer/main.cpp +++ b/kpersonalizer/main.cpp @@ -59,7 +59,7 @@ int main(int argc, char *argv[]) if (!args->isSet("r")) { // we'll first show the first page KFindLanguage *flang = new KFindLanguage(); if( !flang->getBestLang().isEmpty()) // if we have the users language, use it - KGlobal::locale()->setLanguage( flang->getBestLang() ); + TDEGlobal::locale()->setLanguage( flang->getBestLang() ); delete flang; } -- cgit v1.2.1