1 files changed, 0 insertions, 1 deletions

diff --git a/kaddressbook/kabprefs.cpp b/kaddressbook/kabprefs.cpp
index 4b3ee47..79fff47 100644
--- a/kaddressbook/kabprefs.cpp
+++ b/kaddressbook/kabprefs.cpp
@@ -61,149 +61,148 @@ KABPrefs::KABPrefs()
   addItemFont("DetailsFont",&mDetailsFont);
 
 
 #endif //KAB_EMBEDDED
 
   KPrefs::setCurrentGroup( "MainWindow" );
   addItemBool( "JumpButtonBarVisible", &mJumpButtonBarVisible, false );
   addItemBool( "DetailsPageVisible", &mDetailsPageVisible, true );
   addItemIntList( "ExtensionsSplitter", &mExtensionsSplitter );
   addItemIntList( "DetailsSplitter", &mDetailsSplitter );
   addItemBool( "MultipleViewsAtOnce", &mMultipleViewsAtOnce, true );
 
 
   KPrefs::setCurrentGroup( "Extensions_General" );
   QStringList defaultExtensions;
   defaultExtensions << "merge";
   defaultExtensions << "distribution_list_editor";
   addItemInt( "CurrentExtension", &mCurrentExtension, 0 );
   addItemStringList( "ActiveExtensions", &mActiveExtensions, defaultExtensions );
 
   KPrefs::setCurrentGroup( "Views" );
   QString defaultView = i18n( "Default Table View" );
   addItemString( "CurrentView", &mCurrentView, defaultView );
   addItemStringList( "ViewNames", &mViewNames, defaultView );
 
   KPrefs::setCurrentGroup( "Filters" );
   addItemInt( "CurrentFilter", &mCurrentFilter, 0 );
 
 }
 
 KABPrefs::~KABPrefs()
 {
     //qDebug("KABPrefs::~KABPrefs() ");
   setLocaleDict( 0 );
   if ( mLocaleDict )
       delete mLocaleDict;
 }
  
 KABPrefs *KABPrefs::instance()
 {
   if ( !sInstance ) {
 #ifdef KAB_EMBEDDED
     sInstance = staticDeleter.setObject( new KABPrefs() );
 #else  //KAB_EMBEDDED
     //US the following line has changed ???. Why
     staticDeleter.setObject( sInstance, new KABPrefs() );
 #endif //KAB_EMBEDDED
     sInstance->readConfig();
   }
 
   return sInstance;
 }
 
 void KABPrefs::setCategoryDefaults()
 {
   mCustomCategories.clear();
 
   mCustomCategories << i18n( "Business" ) << i18n( "Family" ) << i18n( "School" )
                     << i18n( "Customer" ) << i18n( "Friend" );
 }
 
     // US introduce a nonconst way to return the config object.
 KConfig* KABPrefs::getConfig()
 {
     return config();
 }
 void KABPrefs::usrReadConfig()
 {
     QString fileName ;
 #ifndef DESKTOP_VERSION
     fileName= QString(getenv("QPEDIR"))+"/pics/kdepim/kaddressbook/";
 #else
     fileName  = qApp->applicationDirPath () + "/kdepim/kaddressbook/";
 #endif
     int mPreferredLanguage = KPimGlobalPrefs::instance()->mPreferredLanguage;
     mLocaleDict = 0;
     if ( mPreferredLanguage > 0 && mPreferredLanguage < 5 ) {
          
         if ( mPreferredLanguage == 1 ) 
             fileName = fileName+"germantranslation.txt"; 
         else if ( mPreferredLanguage == 4 ) 
             fileName = fileName+"usertranslation.txt"; 
         else if ( mPreferredLanguage == 2 ) 
             fileName = fileName+"frenchtranslation.txt"; 
         else if ( mPreferredLanguage == 3 ) 
             fileName = fileName+"italiantranslation.txt";
         QFile file( fileName );
         if (file.open( IO_ReadOnly ) ) {
             QTextStream ts( &file );
             ts.setEncoding( QTextStream::Latin1 );
             //ts.setCodec( QTextCodec::latin1 );
             QString  text = ts.read();
             file.close();  
             text.replace( QRegExp("\\\\n"), "\n" );
             QString line;
             QString we;
             QString wt;
             int br = 0;
             int nbr;
             nbr = text.find ( "},", br );
             line = text.mid( br, nbr - br );
             br = nbr+1;
             int se, ee, st, et;
             mLocaleDict = new QDict<QString>;
             QString end = "{ \"\",\"\" }";
             while ( (line != end) && (br > 1)  ) {
                 //qDebug("%d *%s* ", br, line.latin1());
                 se = line.find("\"")+1;
                 et = line.findRev("\"",-1);
                 ee = line.find("\",\"");
                 st = ee+3;
                 we = line.mid( se, ee-se );
                 wt = line.mid( st, et-st );
                 //qDebug("*%s* *%s* ", we.latin1(), wt.latin1());
                 mLocaleDict->insert( we, new QString (wt) );
                 nbr = text.find ( "}", br );
                 line = text.mid( br, nbr - br );
                 br = nbr+1;
             }
             //qDebug("end *%s* ", end.latin1());
 
             setLocaleDict( mLocaleDict );
         } else {
             qDebug("KO: Cannot find translation file %s",fileName.latin1() );
         }
     
         
     }
-    qDebug("KABPrefs::usrReadConfig********************** ");
   KPimPrefs::usrReadConfig();
 }
 
 
 /*US
 void KABPrefs::usrSetDefaults()
 {
   KPimPrefs::usrSetDefaults();
 }
 
 void KABPrefs::usrReadConfig()
 {
   KPimPrefs::usrReadConfig();
 }
 
 void KABPrefs::usrWriteConfig()
 {
   KPimPrefs::usrWriteConfig();
 }
 */