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

List:       kde-commits
Subject:    kdeedu/kmessedwords/kmessedwords
From:       Anne-Marie Mahfouf <annma () kde ! org>
Date:       2004-11-09 1:19:05
Message-ID: 20041109011905.9D22216D39 () office ! kde ! org
[Download RAW message or body]

CVS commit by annma: 

begin port to KConfig XT, did only the user name at the moment


  A            kmessedwords.kcfg   1.1
  A            prefs.kcfgc   1.1
  M +3 -0      .cvsignore   1.9
  M +2 -1      Makefile.am   1.34
  M +4 -41     kmwview.cpp   1.3
  M +0 -1      kmwview.h   1.3


--- kdeedu/kmessedwords/kmessedwords/.cvsignore  #1.8:1.9
@@ -16,2 +16,5 @@
 kmwcfgiface.cc
 frontend.cc
+prefs.cc
+prefs.h
+

--- kdeedu/kmessedwords/kmessedwords/Makefile.am  #1.33:1.34
@@ -1,5 +1,5 @@
 ####### kdevelop will overwrite this part!!! (begin)##########
 bin_PROGRAMS = kmessedwords
-kmessedwords_SOURCES = minparser.cpp answer.cpp mainwindow.cpp frontend.ui \
kmwdict.ui mwconfig.cpp scores.cpp kwritewords.cpp main.cpp kmwcfgiface.ui \
kmwnewconfig.cc kmwview.cpp +kmessedwords_SOURCES = minparser.cpp answer.cpp \
mainwindow.cpp frontend.ui kmwdict.ui mwconfig.cpp scores.cpp kwritewords.cpp \
main.cpp kmwcfgiface.ui kmwnewconfig.cc kmwview.cpp prefs.kcfgc  kmessedwords_LDADD   \
=  $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)  
@@ -9,4 +9,5 @@
 
 xdg_apps_DATA = kmessedwords.desktop
+kde_kcfg_DATA = kmessedwords.kcfg
 
 txt_DATA = easy.txt hard.txt medium.txt

--- kdeedu/kmessedwords/kmessedwords/kmwview.cpp  #1.2:1.3
@@ -20,4 +20,5 @@
 #include "mainwindow.h"
 #include "kmwview.h"
+#include "prefs.h"
 
 
@@ -38,5 +39,4 @@ KmwView::KmwView(MainWindow *parent, con
         config = kapp->config();
         mainScreen->setAutoMask(true);
-        first_run(); //makes the config file and all...
 }
     
@@ -86,6 +86,5 @@ void KmwView::slot_try()
                                         {
                                                 //scoring final calc thingy goes \
                here :)
-                                                config->setGroup("Environment");
-                                                \
shareLoginName=config->readEntry("GamerName", ""); +                                  \
shareLoginName = Prefs::gamerName();  
                                                 solvedWords++;
@@ -255,6 +254,5 @@ void KmwView::resetKMW()
 void KmwView::theEnd()
 {
-        config->setGroup("Environment");
-        shareLoginName=config->readEntry("GamerName", "");
+        shareLoginName = Prefs::gamerName();
         
         solvedWords++;
@@ -276,6 +274,5 @@ void KmwView::theReply()
 void KmwView::write_scores()
 {
-        config->setGroup("Environment");
-        shareLoginName=config->readEntry("GamerName", "");
+        shareLoginName=Prefs::gamerName();
         
                 //this is for the levels...
@@ -341,38 +338,4 @@ void KmwView::read_scores() //actually..
 }
 
-void KmwView::first_run()
-{
-        config->setGroup("First_run");
-        if (config->readBoolEntry("Run",true)==true)
-        {
-                //KMessageBox::information(this,i18n("The player name has been set \
to that of the user account. The player name can be changed in Configure, \
                Configuration."));
-                config->writeEntry("Run","false");
-        }
-        
-        struct passwd* pw;
-        
-        config->setGroup("Environment");
-        shareLoginName=config->readEntry("GamerName","");
-        
-        if (shareLoginName.isEmpty())
-        {
-                pw = getpwuid(getuid());
-                if (pw)
-                {
-                        shareLoginName = pw->pw_gecos;
-                        int i = shareLoginName.find(',');
-                        if (i>0)
-                                shareLoginName.truncate(i);
-                }
-                config->setGroup("Environment");
-                config->writeEntry("GamerName", shareLoginName);
-        }
-        else
-        {
-                kdDebug() << "Name set to user, that has been read from \
                configuration file..." << endl;
-        }
-        kdDebug() << "Name found: " << shareLoginName << endl;
-        config->sync();
-}
 
 #include  "kmwview.moc"

--- kdeedu/kmessedwords/kmessedwords/kmwview.h  #1.2:1.3
@@ -76,5 +76,4 @@ protected:
         */
         void resetKMW();
-        void first_run();
         
 public slots:


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