SVN commit 497602 by mlaurent: read*entry-- M +1 -1 katedocmanager.cpp M +1 -1 kateexternaltools.cpp M +5 -5 katefilelist.cpp M +2 -2 katemdi.cpp M +2 -2 katesession.cpp --- trunk/KDE/kdebase/kate/app/katedocmanager.cpp #497601:497602 @@ -380,7 +380,7 @@ config->setGroup ("Open Documents"); QString grp = config->group(); - unsigned int count = config->readUnsignedNumEntry("Count", 0); + unsigned int count = config->readEntry("Count", 0); if (count == 0) { --- trunk/KDE/kdebase/kate/app/kateexternaltools.cpp #497601:497602 @@ -787,7 +787,7 @@ KateExternalTool *t = ((ToolItem*)lbTools->selectedItem())->tool; KateExternalToolServiceEditor editor( t, this); config->setGroup( "Editor" ); - editor.resize( config->readSizeEntry( "Size" ) ); + editor.resize( config->readEntry( "Size", QSize() ) ); if ( editor.exec() /*== KDialogBase::Ok*/ ) { --- trunk/KDE/kdebase/kate/app/katefilelist.cpp #497601:497602 @@ -404,9 +404,9 @@ config->setGroup( group ); setSortType( config->readEntry( "Sort Type", int(sortByID) ) ); - m_viewShade = config->readColorEntry( "View Shade", &m_viewShade ); - m_editShade = config->readColorEntry( "Edit Shade", &m_editShade ); - m_enableBgShading = config->readEntry( "Shading Enabled", QVariant(&m_enableBgShading )).toBool(); + m_viewShade = config->readEntry( "View Shade", m_viewShade ); + m_editShade = config->readEntry( "Edit Shade", m_editShade ); + m_enableBgShading = config->readEntry( "Shading Enabled", m_enableBgShading ); sortAction->setCurrentItem( sortType() ); @@ -630,8 +630,8 @@ KConfig *config = KGlobal::config(); config->setGroup( "Filelist" ); cbEnableShading->setChecked( config->readEntry("Shading Enabled", QVariant(&m_filelist->m_enableBgShading )).toBool() ); - kcbViewShade->setColor( config->readColorEntry("View Shade", &m_filelist->m_viewShade ) ); - kcbEditShade->setColor( config->readColorEntry("Edit Shade", &m_filelist->m_editShade ) ); + kcbViewShade->setColor( config->readEntry("View Shade", m_filelist->m_viewShade ) ); + kcbEditShade->setColor( config->readEntry("Edit Shade", m_filelist->m_editShade ) ); cmbSort->setCurrentItem( m_filelist->sortType() ); m_changed = false; } --- trunk/KDE/kdebase/kate/app/katemdi.cpp #497601:497602 @@ -538,7 +538,7 @@ { ToolView *tv = m_toolviews[firstWrong]; - int pos = config->readUnsignedNumEntry (QString ("Kate-MDI-ToolView-%1-Sidebar-Position").arg(tv->id), firstWrong); + int pos = config->readEntry (QString ("Kate-MDI-ToolView-%1-Sidebar-Position").arg(tv->id), firstWrong); if (pos != firstWrong) break; @@ -553,7 +553,7 @@ { TmpToolViewSorter s; s.tv = m_toolviews[i]; - s.pos = config->readUnsignedNumEntry (QString ("Kate-MDI-ToolView-%1-Sidebar-Position").arg(m_toolviews[i]->id), i); + s.pos = config->readEntry (QString ("Kate-MDI-ToolView-%1-Sidebar-Position").arg(m_toolviews[i]->id), i); toSort.push_back (s); } --- trunk/KDE/kdebase/kate/app/katesession.cpp #497601:497602 @@ -85,7 +85,7 @@ // get the document count config.setGroup ("Open Documents"); - m_documents = config.readUnsignedNumEntry("Count", 0); + m_documents = config.readEntry("Count", 0); return; } @@ -294,7 +294,7 @@ if (c->readEntry("Restore Window Configuration", QVariant(true)).toBool()) { sc->setGroup ("Open MainWindows"); - int wCount = sc->readUnsignedNumEntry("Count", 1); + int wCount = sc->readEntry("Count", 1); for (int i=0; i < wCount; ++i) {