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

List:       kde-commits
Subject:    KDE/kdelibs/kde3support/kdeui
From:       Kevin Ottens <ervin () kde ! org>
Date:       2010-11-04 8:18:05
Message-ID: 20101104081805.2E963AC89E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1192874 by ervin:

Port away from deprecated API.


 M  +1 -1      k3command.cpp  
 M  +10 -10    k3dockwidget.cpp  


--- trunk/KDE/kdelibs/kde3support/kdeui/k3command.cpp #1192873:1192874
@@ -373,7 +373,7 @@
 
     connect( d->commandHistory, SIGNAL(commandHistoryChanged()), this, \
SLOT(slotCommandHistoryChanged()) );  slotCommandHistoryChanged();
-    actionCollection->addAction(KStandardAction::stdName(type == Undo ? \
KStandardAction::Undo : KStandardAction::Redo), +    \
actionCollection->addAction(KStandardAction::name(type == Undo ? \
KStandardAction::Undo : KStandardAction::Redo),  this);
 }
 
--- trunk/KDE/kdelibs/kde3support/kdeui/k3dockwidget.cpp #1192873:1192874
@@ -2823,7 +2823,7 @@
   // they must be restored before e.g. tabgroups are restored
   foreach( const QString &oname, nameList )
   {
-    cg.changeGroup( group );
+    cg = KConfigGroup( c, group );
     QString type = cg.readEntry( oname + ":type", QString() );
     obj = 0L;
 
@@ -2833,7 +2833,7 @@
       obj->applyToWidget( 0L );
       obj->setGeometry(r);
 
-      cg.changeGroup( group );
+      cg = KConfigGroup( c, group );
       obj->setTabPageLabel(cg.readEntry( oname + ":tabCaption", QString() ));
       obj->setToolTipString(cg.readEntry( oname + ":tabToolTip", QString() ));
       if ( cg.readEntry( oname + ":visible",QVariant(false) ).toBool() ){
@@ -2859,7 +2859,7 @@
   // secondly, after the common dockwidgets, restore the groups and tabgroups
   foreach( const QString &oname, nameList )
   {
-    cg.changeGroup( group );
+    cg = KConfigGroup( c, group );
     QString type = cg.readEntry( oname + ":type", QString() );
     obj = 0L;
 
@@ -2892,7 +2892,7 @@
         }
         if ( tabDockGroup ){
           tabDockGroup->setName( oname.toLatin1().constData() );
-          cg.changeGroup( group );
+          cg = KConfigGroup( c, group );
           if (tab)
             tab->showPage( tab->page( cg.readEntry( oname+":curTab",0 ) ) );
         }
@@ -2910,13 +2910,13 @@
   // iterate them again and link the toplevel ones of them with their corresponding \
dockwidget for the dockback action  foreach( const QString &oname, nameList )
   {
-    cg.changeGroup( group );
+    cg = KConfigGroup( c, group );
     QString type = cg.readEntry( oname + ":type", QString() );
     obj = 0L;
 
     if ( type == "NULL_DOCK" || cg.readEntry( oname + ":parent", QString() ) == \
"___null___" ){  obj = getDockWidgetFromName( oname );
-      cg.changeGroup( group );
+      cg = KConfigGroup( c, group );
       QString name = cg.readEntry( oname + ":dockBackTo", QString() );
       if (!name.isEmpty()) {
           obj->setFormerBrotherDockWidget(getDockWidgetFromName( name ));
@@ -2928,7 +2928,7 @@
   if ( main->inherits("K3DockMainWindow") ){
     K3DockMainWindow* dmain = (K3DockMainWindow*)main;
 
-    cg.changeGroup( group );
+    cg = KConfigGroup( c, group );
     QString mv = cg.readEntry( "Main:view" );
     if ( !mv.isEmpty() && getDockWidgetFromName( mv ) ){
       K3DockWidget* mvd  = getDockWidgetFromName( mv );
@@ -2936,14 +2936,14 @@
       mvd->show();
       dmain->setView( mvd );
     }
-    cg.changeGroup( group );
+    cg = KConfigGroup( c, group );
     QString md = cg.readEntry( "Main:dock" );
     if ( !md.isEmpty() && getDockWidgetFromName( md ) ){
       K3DockWidget* mvd  = getDockWidgetFromName( md );
       dmain->setMainDockWidget( mvd );
     }
   } else {
-    cg.changeGroup( group );
+    cg = KConfigGroup( c, group );
     QString mv = cg.readEntry( "Main:view" );
     if ( !mv.isEmpty() && getDockWidgetFromName( mv ) ){
       K3DockWidget* mvd  = getDockWidgetFromName( mv );
@@ -2958,7 +2958,7 @@
     finishReadDockConfig(); // remove empty dockwidgets
   }
 
-  cg.changeGroup( group );
+  cg = KConfigGroup( c, group );
 
   QRect mr = cg.readEntry("Main:Geometry", QRect());
 


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