[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/runtime
From:       Bernhard Loos <nhuh.put () web ! de>
Date:       2007-09-11 0:37:29
Message-ID: 1189471049.352508.26678.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 710847 by bloos:

adapt to the KLocale changes

 M  +5 -2      kcmshell/main.cpp  
 M  +3 -2      kcontrol/locale/countryselectordialog.cpp  
 M  +2 -2      kcontrol/locale/countryselectordialog.h  
 M  +2 -1      kcontrol/locale/kcmlocale.cpp  
 M  +3 -3      kcontrol/locale/kcmlocale.h  
 AM            kcontrol/locale/kcontrollocale.h   [License: GPL (v2+)]
 M  +4 -3      kcontrol/locale/toplevel.cpp  
 M  +2 -2      kcontrol/locale/toplevel.h  


--- trunk/KDE/kdebase/runtime/kcmshell/main.cpp #710846:710847
@@ -191,8 +191,11 @@
     const KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
 
     const QString lang = args->getOption("lang");
-    if( !lang.isEmpty() )
-        KGlobal::locale()->setLanguage(lang);
+    if( !lang.isEmpty() ) {
+        KLocale *locale = new KLocale(aboutData.catalogName(), lang);
+        delete KGlobal::locale();
+        KGlobal::setLocale(locale);
+    }
 
     if (args->isSet("list"))
     {
--- trunk/KDE/kdebase/runtime/kcontrol/locale/countryselectordialog.cpp #710846:710847
@@ -9,7 +9,8 @@
 
 #include "countryselectordialog.h"
 
-#include <KLocale>
+#include "kcontrollocale.h"
+
 #include <KStandardDirs>
 
 #include <QAbstractItemModel>
@@ -220,7 +221,7 @@
     setMainWidget(widget);
 }
 
-bool CountrySelectorDialog::editCountry(KLocale *locale)
+bool CountrySelectorDialog::editCountry(KControlLocale *locale)
 {
     QHBoxLayout *hbl = new QHBoxLayout(mainWidget());
     CSDListView *lv1 = new CSDListView(mainWidget());
--- trunk/KDE/kdebase/runtime/kcontrol/locale/countryselectordialog.h #710846:710847
@@ -14,7 +14,7 @@
 
 class CSDListView;
 
-class KLocale;
+class KControlLocale;
 
 class QModelIndex;
 
@@ -24,7 +24,7 @@
     public:
         CountrySelectorDialog(QWidget *parent);
 
-        bool editCountry(KLocale *locale);
+        bool editCountry(KControlLocale *locale);
 
     private slots:
         void regionChanged(const QModelIndex &current);
--- trunk/KDE/kdebase/runtime/kcontrol/locale/kcmlocale.cpp #710846:710847
@@ -39,8 +39,9 @@
 #include "toplevel.h"
 #include "klanguagebutton.h"
 #include "countryselectordialog.h"
+#include "kcontrollocale.h"
 
-KLocaleConfig::KLocaleConfig(KLocale *locale, QWidget *parent)
+KLocaleConfig::KLocaleConfig(KControlLocale *locale, QWidget *parent)
   : QWidget (parent),
     m_locale(locale)
 {
--- trunk/KDE/kdebase/runtime/kcontrol/locale/kcmlocale.h #710846:710847
@@ -28,7 +28,7 @@
 #include <QWidget>
 #include "ui_language.h"
 
-class KLocale;
+class KControlLocale;
 
 
 class KLocaleConfig : public QWidget, public Ui_Language
@@ -36,7 +36,7 @@
   Q_OBJECT
 
 public:
-  explicit KLocaleConfig( KLocale *_locale, QWidget *parent = 0);
+  explicit KLocaleConfig( KControlLocale *_locale, QWidget *parent = 0);
 
   void save();
 
@@ -70,7 +70,7 @@
 private:
   QStringList languageList() const;
 
-  KLocale *m_locale;
+  KControlLocale *m_locale;
 };
 
 #endif
** trunk/KDE/kdebase/runtime/kcontrol/locale/kcontrollocale.h #property svn:eol-style
   + native
--- trunk/KDE/kdebase/runtime/kcontrol/locale/toplevel.cpp #710846:710847
@@ -46,6 +46,7 @@
 #include <kconfiggroup.h>
 #include <kpluginfactory.h>
 #include <kpluginloader.h>
+#include "kcontrollocale.h"
 
 K_PLUGIN_FACTORY(KLocaleFactory,
         KLocale::setMainCatalog("kcmlocale");
@@ -70,7 +71,7 @@
   m_nullConfig = KSharedConfig::openConfig(QString(), KConfig::NoGlobals );
   m_globalConfig = KSharedConfig::openConfig(QString(), KConfig::IncludeGlobals );
 
-  m_locale = new KLocale(QLatin1String("kcmlocale"), m_nullConfig);
+  m_locale = new KControlLocale(QLatin1String("kcmlocale"), m_nullConfig);
 
   QVBoxLayout *l = new QVBoxLayout(this);
   l->setMargin(0);
@@ -170,7 +171,7 @@
 void KLocaleApplication::load()
 {
   m_globalConfig->reparseConfiguration();
-  *m_locale = KLocale(QLatin1String("kcmlocale"), m_globalConfig);
+  *m_locale = KControlLocale(QLatin1String("kcmlocale"), m_globalConfig);
 
   emit localeChanged();
   emit languageChanged();
@@ -216,7 +217,7 @@
 
 void KLocaleApplication::defaults()
 {
-  *m_locale = KLocale(QLatin1String("kcmlocale"), m_nullConfig);
+  *m_locale = KControlLocale(QLatin1String("kcmlocale"), m_nullConfig);
 
   kDebug() << "defaults: " << m_locale->languageList();
 
--- trunk/KDE/kdebase/runtime/kcontrol/locale/toplevel.h #710846:710847
@@ -32,7 +32,7 @@
 class QGroupBox;
 class QTabWidget;
 
-class KLocale;
+class KControlLocale;
 class KLocaleConfig;
 class KLocaleConfigMoney;
 class KLocaleConfigNumber;
@@ -65,7 +65,7 @@
   void slotChanged();
 
 private:
-  KLocale *m_locale;
+  KControlLocale *m_locale;
 
   QTabWidget          *m_tab;
   KLocaleConfig       *m_localemain;
[prev in list] [next in list] [prev in thread] [next in thread]