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

List:       kde-commits
Subject:    branches/work/kconfiggroup_port/kdegraphics
From:       Stephan Kulow <coolo () kde ! org>
Date:       2007-02-14 17:41:13
Message-ID: 1171474873.942660.20610.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 633648 by coolo:

ported


 M  +6 -9      kcoloredit/kcoloredit.cpp  
 M  +25 -31    kfax/kfax.cpp  
 M  +11 -12    kghostview/kgvshell.cpp  
 M  +4 -4      kiconedit/kiconedit.cpp  
 M  +3 -3      kolourpaint/mainwindow/kpmainwindow_file.cpp  
 M  +13 -15    kpovmodeler/pmshell.cpp  
 M  +4 -4      ligature/shell/ligature.cpp  


--- branches/work/kconfiggroup_port/kdegraphics/kcoloredit/kcoloredit.cpp \
#633647:633648 @@ -152,21 +152,18 @@
 
 void KColorEditApp::saveOptions()
 {
-  saveMainWindowSettings( config.data(), "MainWindowSettings" );
-  m_actRecent->saveEntries( config.data() );
+  saveMainWindowSettings( config->group( "MainWindowSettings" ) );
+  m_actRecent->saveEntries( config->group( QString() ) );
 
-  config->setGroup("KColorEdit Options");
-  config->writeEntry("ColorNames", viewColorNames);
+  config->group("KColorEdit Options").writeEntry("ColorNames", viewColorNames);
 }
 
 void KColorEditApp::readOptions()
 {
-  applyMainWindowSettings( config.data(), "MainWindowSettings" );
-  m_actRecent->loadEntries( config.data() );
+  applyMainWindowSettings( config->group( "MainWindowSettings" ) );
+  m_actRecent->loadEntries( config->group( QString() ) );
 
-  config->setGroup("KColorEdit Options");
-
-  viewColorNames = config->readEntry("ColorNames", false);
+  viewColorNames = config->group("KColorEdit Options" ).readEntry("ColorNames", \
false);  m_actNames->setChecked(viewColorNames);
   doc->slotChangeViewMode(viewColorNames);
 }
--- branches/work/kconfiggroup_port/kdegraphics/kfax/kfax.cpp #633647:633648
@@ -307,24 +307,22 @@
 {
   config = KGlobal::config();
 
-  applyMainWindowSettings( config.data(), "MainWindowSettings" );
+  applyMainWindowSettings( config.data()->group( "MainWindowSettings" ) );
 
-  actRecent->loadEntries( config.data() );
+  actRecent->loadEntries( config->group( QString() ) );
 
-  config->setGroup("General Options");
+  KConfigGroup cg( config, "Fax Options");
 
-  config->setGroup("Fax Options");
+  fop.width = cg.readEntry("width", 1728);
+  fop.resauto = cg.readEntry("resauto", 1);
+  fop.geomauto = cg.readEntry("geomauto", 1);
+  fop.height = cg.readEntry("height", 2339);
+  fop.fine = cg.readEntry("resolution", 1);
+  fop.flip = cg.readEntry("flip", 0);
+  fop.invert = cg.readEntry("invert", 0);
+  fop.lsbfirst = cg.readEntry("lsb", 0);
+  fop.raw = cg.readEntry("raw", 3);
 
-  fop.width = config->readEntry("width", 1728);
-  fop.resauto = config->readEntry("resauto", 1);
-  fop.geomauto = config->readEntry("geomauto", 1);
-  fop.height = config->readEntry("height", 2339);
-  fop.fine = config->readEntry("resolution", 1);
-  fop.flip = config->readEntry("flip", 0);
-  fop.invert = config->readEntry("invert", 0);
-  fop.lsbfirst = config->readEntry("lsb", 0);
-  fop.raw = config->readEntry("raw", 3);
-
   setFaxDefaults();
 }
 
@@ -360,31 +358,27 @@
 
 bool TopLevel::queryClose()
 {
-  saveMainWindowSettings( config.data(), "MainWindowSettings" );
-  actRecent->saveEntries( config.data() );
+  saveMainWindowSettings( config->group( "MainWindowSettings" ) );
+  actRecent->saveEntries( config->group( QString() ) );
 
   return true;
 }
 
 void TopLevel::writeSettings()
 {
-  config = KGlobal::config();
+  KConfigGroup cg( KGlobal::config(), "Fax Options");
 
-  config->setGroup("General Options");
+  cg.writeEntry("resauto",fop.resauto);
+  cg.writeEntry("geomauto",fop.geomauto);
+  cg.writeEntry("width",fop.width);
+  cg.writeEntry("height",fop.height);
+  cg.writeEntry("resolution",fop.fine);
+  cg.writeEntry("flip",fop.flip);
+  cg.writeEntry("invert",fop.invert);
+  cg.writeEntry("lsb",fop.lsbfirst);
+  cg.writeEntry("raw",fop.raw);
 
-  config->setGroup("Fax Options");
-
-  config->writeEntry("resauto",fop.resauto);
-  config->writeEntry("geomauto",fop.geomauto);
-  config->writeEntry("width",fop.width);
-  config->writeEntry("height",fop.height);
-  config->writeEntry("resolution",fop.fine);
-  config->writeEntry("flip",fop.flip);
-  config->writeEntry("invert",fop.invert);
-  config->writeEntry("lsb",fop.lsbfirst);
-  config->writeEntry("raw",fop.raw);
-
-  config->sync();
+  cg.sync();
 }
 
 void TopLevel::faxOpen()
--- branches/work/kconfiggroup_port/kdegraphics/kghostview/kgvshell.cpp \
#633647:633648 @@ -196,7 +196,7 @@
 void
 KGVShell::readSettings()
 {
-    recent->loadEntries( KGlobal::config().data() );
+    recent->loadEntries( KGlobal::config()->group( QString() ) );
     QStringList items = recent->items();
 
 // Code copied from kviewshell.cpp:
@@ -213,10 +213,10 @@
         }
     }
 
-    applyMainWindowSettings(KGlobal::config().data(), "MainWindow");
+    applyMainWindowSettings( KGlobal::config()->group( "MainWindow") );
 
-    KGlobal::config()->setDesktopGroup();
-    bool fullScreen = KGlobal::config()->readEntry( "FullScreen", false );
+    KConfigGroup cg( KGlobal::config(), "Desktop Entry" );
+    bool fullScreen = cg.readEntry( "FullScreen", false );
     setFullScreen( fullScreen );
     _showMenuBarAction->setChecked( menuBar()->isVisible() );
 }
@@ -224,14 +224,13 @@
 void
 KGVShell::writeSettings()
 {
-    saveMainWindowSettings(KGlobal::config().data(), "MainWindow");
+    saveMainWindowSettings(KGlobal::config()->group( "MainWindow") );
 
-    recent->saveEntries( KGlobal::config().data() );
+    recent->saveEntries( KGlobal::config()->group( QString() ) );
 
-    KGlobal::config()->setDesktopGroup();
-    KGlobal::config()->writeEntry( "FullScreen", m_fullScreenAction->isChecked());
-
-    KGlobal::config()->sync();
+    KConfigGroup cg( KGlobal::config(), "Desktop Entry" );
+    cg.writeEntry( "FullScreen", m_fullScreenAction->isChecked());
+    cg.sync();
 }
 
 void
@@ -350,7 +349,7 @@
 
 void KGVShell::slotConfigureToolbars()
 {
-    saveMainWindowSettings( KGlobal::config().data(), "MainWindow" );
+    saveMainWindowSettings( KGlobal::config()->group( "MainWindow" ) );
     KEditToolbar dlg( factory() );
     connect(&dlg,SIGNAL(newToolbarConfig()),this,SLOT(slotNewToolbarConfig()));
     dlg.exec();
@@ -358,7 +357,7 @@
 
 void KGVShell::slotNewToolbarConfig()
 {
-    applyMainWindowSettings( KGlobal::config().data(), "MainWindow" );
+    applyMainWindowSettings( KGlobal::config()->group( "MainWindow" ) );
 }
 
 void KGVShell::slotRMBClick()
--- branches/work/kconfiggroup_port/kdegraphics/kiconedit/kiconedit.cpp \
#633647:633648 @@ -148,7 +148,7 @@
 
   setCentralWidget(gridview);
 
-  applyMainWindowSettings( KGlobal::config().data(), "MainWindowSettings" );
+  applyMainWindowSettings( KGlobal::config()->group( "MainWindowSettings" ) );
   updateProperties();
 
   updateAccels();
@@ -222,11 +222,11 @@
 void KIconEdit::writeConfig()
 {
     KSharedConfig::Ptr config = KGlobal::config();
-    m_actRecent->saveEntries( KGlobal::config().data() );
+    m_actRecent->saveEntries( KGlobal::config()->group( QString() ) );
 
     KIconEditProperties::self()->save();
 
-    saveMainWindowSettings( config.data(), "MainWindowSettings" );
+    saveMainWindowSettings( config->group( "MainWindowSettings" ) );
 }
 
 QSize KIconEdit::sizeHint() const
@@ -263,7 +263,7 @@
   m_actRecent = KStandardAction::openRecent(this,
       SLOT(slotOpenRecent(const KUrl&)), actionCollection());
   m_actRecent->setMaxItems(15); // FIXME should be configurable!
-  m_actRecent->loadEntries(KGlobal::config().data());
+  m_actRecent->loadEntries(KGlobal::config()->group( QString() ) );
 
   action = KStandardAction::save(this, SLOT(slotSave()), actionCollection());
   action->setWhatsThis(i18n("Save\n\nSave the current icon"));
--- branches/work/kconfiggroup_port/kdegraphics/kolourpaint/mainwindow/kpmainwindow_file.cpp \
#633647:633648 @@ -71,7 +71,7 @@
     m_actionOpen = KStandardAction::open (this, SLOT (slotOpen ()), ac);
 
     m_actionOpenRecent = KStandardAction::openRecent (this, SLOT (slotOpenRecent \
                (const KUrl &)), ac);
-    m_actionOpenRecent->loadEntries (KGlobal::config ().data());
+    m_actionOpenRecent->loadEntries (KGlobal::config ()->group( QString() ) );
 
     m_actionSave = KStandardAction::save (this, SLOT (slotSave ()), ac);
     m_actionSaveAs = KStandardAction::saveAs (this, SLOT (slotSaveAs ()), ac);
@@ -163,11 +163,11 @@
 
     // HACK: Something might have changed interprocess.
     // If we could PROPAGATE: interprocess, then this wouldn't be required.
-    m_actionOpenRecent->loadEntries (cfg.data());
+    m_actionOpenRecent->loadEntries (cfg->group( QString() ) );
 
     m_actionOpenRecent->addUrl (url);
 
-    m_actionOpenRecent->saveEntries (cfg.data());
+    m_actionOpenRecent->saveEntries (cfg->group( QString() ) );
     cfg->sync ();
 
 #if DEBUG_KP_MAIN_WINDOW
--- branches/work/kconfiggroup_port/kdegraphics/kpovmodeler/pmshell.cpp \
#633647:633648 @@ -77,9 +77,8 @@
    m_pStatusBar->insertItem( " ", c_statusBarInfo, 1 );
    m_pStatusBar->insertItem( "" , c_statusBarControlPoints );
 
-   KSharedConfig::Ptr config = componentData( ).config( );
-   config->setGroup( "Appearance" );
-   applyMainWindowSettings( config.data() );
+   KConfigGroup config( componentData( ).config( ), "Appearance" );
+   applyMainWindowSettings( config );
 
    if( !url.isEmpty( ) )
       openUrl( url );
@@ -538,7 +537,7 @@
 
 void PMShell::slotConfigureToolbars( )
 {
-   saveMainWindowSettings( KGlobal::config( ).data(), "Appearance" );
+   saveMainWindowSettings( KGlobal::config( )->group( "Appearance" ) );
    KEditToolbar dlg( factory( ) );
    connect( &dlg, SIGNAL( newToolbarConfig( ) ),
             this, SLOT( slotNewToolbarConfig( ) ) );
@@ -550,33 +549,32 @@
    createGUI( 0 );
    createShellGUI( false );
    createGUI( m_pPart );
-   applyMainWindowSettings( KGlobal::config( ).data(), "Appearance" );
+   applyMainWindowSettings( KGlobal::config( )->group( "Appearance" ) );
 }
 
 void PMShell::updateGUI( )
 {
-   saveMainWindowSettings( KGlobal::config( ).data(), "Appearance" );
+   saveMainWindowSettings( KGlobal::config( )->group( "Appearance" ) );
    createGUI( 0 );
    createShellGUI( false );
    createGUI( m_pPart );
-   applyMainWindowSettings( KGlobal::config( ).data(), "Appearance" );
+   applyMainWindowSettings( KGlobal::config( )->group( "Appearance" ) );
 }
 
 void PMShell::saveOptions( )
 {
    kDebug( PMArea ) << "Saving configuration" << endl;
-   KSharedConfig::Ptr config = KGlobal::config( );
+   KConfigGroup config( KGlobal::config( ), "Appearance" );
 
    // set group
-   config->setGroup( "Appearance" );
-   config->writeEntry( "ShowStatusbar", m_pStatusbarAction->isChecked( ) );
-   saveMainWindowSettings( config.data() );
-   m_pRecent->saveEntries( config.data() );
+   config.writeEntry( "ShowStatusbar", m_pStatusbarAction->isChecked( ) );
+   saveMainWindowSettings( config );
+   m_pRecent->saveEntries( config );
 
    if( m_pPart )
-      m_pPart->saveConfig( config.data() );
+       m_pPart->saveConfig( KGlobal::config().data() );
 
-   config->sync( );
+   config.sync( );
 }
 
 void PMShell::restoreOptions( )
@@ -597,7 +595,7 @@
    else
       statusBar( )->hide( );
 
-   m_pRecent->loadEntries( config.data() );
+   m_pRecent->loadEntries( config->group( QString() ) );
 }
 
 void PMShell::setCaption( const QString& caption )
--- branches/work/kconfiggroup_port/kdegraphics/ligature/shell/ligature.cpp \
#633647:633648 @@ -252,7 +252,7 @@
   config->setGroup("General");
 
   if (recent != 0) {
-    recent->loadEntries(config.data(), "Recent Files");
+    recent->loadEntries(config->group( "Recent Files") );
 
     // Constant source of annoyance in KDVI < 1.0: the 'recent-files'
     // menu contains lots of files which don't exist (any longer). Thus,
@@ -280,7 +280,7 @@
   KSharedConfig::Ptr config = KGlobal::config();
   config->setGroup( "General" );
   if (recent != 0)
-    recent->saveEntries(config.data(), "Recent Files");
+    recent->saveEntries(config->group( "Recent Files") );
 
   config->sync();
 }
@@ -434,7 +434,7 @@
 
 void Ligature::slotEditToolbar()
 {
-  saveMainWindowSettings( KGlobal::config().data(), autoSaveGroup() );
+  saveMainWindowSettings( KGlobal::config()->group( autoSaveGroup() ) );
   KEditToolbar dlg(factory());
   connect( &dlg, SIGNAL( newToolbarConfig() ), SLOT( slotNewToolbarConfig() ) );
   dlg.exec();
@@ -443,7 +443,7 @@
 
 void Ligature::slotNewToolbarConfig()
 {
-  applyMainWindowSettings( KGlobal::config().data(), autoSaveGroup() );
+  applyMainWindowSettings( KGlobal::config()->group( autoSaveGroup() ) );
 }
 
 


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