kdelibs4support--

kmplot/CMakeLists.txt

 
-
+add_definitions(-DTRANSLATION_DOMAIN=\"kmplot\")
 
 
 ########### next target ###############

kmplot/functioneditor.cpp

@@ -724,7 +724,7 @@ void FunctionEditor::saveFunction( Function * tempFunction )
 		Settings::setDefaultEquationForm( Settings::EnumDefaultEquationForm::Function );
 	else
 		Settings::setDefaultEquationForm( Settings::EnumDefaultEquationForm::Implicit );
-	Settings::self()->writeConfig();
+	Settings::self()->save();
 	
 	MainDlg::self()->requestSaveCurrentState();
 	functionListItem->update();

kmplot/kmplot.cpp

@@ -180,7 +180,7 @@ void KmPlot::fileNew()
 
 void KmPlot::applyNewToolbarConfig()
 {
-	applyMainWindowSettings(KGlobal::config()->group( QString() ));
+	applyMainWindowSettings(KSharedConfig::openConfig()->group( QString() ));
 }
 
 void KmPlot::fileOpen()

kmplot/kmplot.kcfg

@@ -4,7 +4,7 @@
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
       http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
   
-        <include>kglobalsettings.h</include>
+        <include>QFontDatabase</include>
 	<kcfgfile name="kmplotrc"/> 
 	
 	<group name="Coordinate System"> 
@@ -107,17 +107,17 @@
 		<entry name="AxesFont" type="Font">
 			<label>Font of the axis labels</label>
 			<whatsthis>Choose a font for the axis labels.</whatsthis>
-			<default code="true">KGlobalSettings::generalFont()</default>
+			<default code="true">QFontDatabase::systemFont(QFontDatabase::GeneralFont)</default>
 		</entry>
 		<entry name="HeaderTableFont" type="Font"> 
 			<label>Font of the printed header table</label>
 			<whatsthis>Choose a font for the table printed at the top of the page.</whatsthis>
-			<default code="true">KGlobalSettings::generalFont()</default>	
+			<default code="true">QFontDatabase::systemFont(QFontDatabase::GeneralFont)</default>	
 		</entry>
 		<entry name="LabelFont" type="Font">
 			<label>Font of diagram labels</label>
 			<whatsthis>Choose a font for diagram labels.</whatsthis>
-			<default code="true">KGlobalSettings::generalFont()</default>
+			<default code="true">QFontDatabase::systemFont(QFontDatabase::GeneralFont)</default>
 		</entry>
 	</group>
 	

kmplot/maindlg.cpp

@@ -178,7 +178,7 @@ MainDlg::MainDlg(QWidget *parentWidget, QObject *parent, const QStringList& ) :
 	setupActions();
 	XParser::self()->constants()->load();
 	kmplotio = new KmPlotIO();
-	m_config = KGlobal::config();
+	m_config = KSharedConfig::openConfig();
 	m_recentFiles->loadEntries( m_config->group( QString() ) );
 
 

kmplot/parser.cpp

@@ -1463,7 +1463,7 @@ ExpressionSanitizer::ExpressionSanitizer( Parser * parser )
 	: m_parser( parser )
 {
 	m_str = 0l;
-	m_decimalSymbol = KGlobal::locale()->decimalSymbol();
+	m_decimalSymbol = KLocale::global()->decimalSymbol();
 }
 
 

kmplot/view.cpp

@@ -3571,7 +3571,7 @@ void View::mouseReleaseEvent ( QMouseEvent * e )
 
 		case Translating:
 			doDrawPlot = true;
-			Settings::self()->writeConfig();
+			Settings::self()->save();
 			MainDlg::self()->requestSaveCurrentState();
 			break;
 
@@ -3729,7 +3729,7 @@ void View::animateZoom( const QRectF & _newCoords )
 	Settings::setXMax( Parser::number( m_xmax ) );
 	Settings::setYMin( Parser::number( m_ymin ) );
 	Settings::setYMax( Parser::number( m_ymax ) );
-	Settings::self()->writeConfig();
+	Settings::self()->save();
 	MainDlg::self()->coordsDialog()->updateXYRange();
 	MainDlg::self()->requestSaveCurrentState();