diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:44:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:44:46 -0600 |
| commit | cee429821aa6f1acc97fb482d325fb4eb37376ca (patch) | |
| tree | 4f55e04b7f000c854fe2b8347dcdb62d97de3c73 /kmplot | |
| parent | ab801f72ab45e8066a8ec6c533ef13c2da67e559 (diff) | |
| download | tdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.tar.gz tdeedu-cee429821aa6f1acc97fb482d325fb4eb37376ca.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kmplot')
| -rw-r--r-- | kmplot/kmplot/editfunctionpage.ui | 2 | ||||
| -rw-r--r-- | kmplot/kmplot/kmplot.cpp | 4 | ||||
| -rw-r--r-- | kmplot/kmplot/kmplot.kcfg | 4 | ||||
| -rw-r--r-- | kmplot/kmplot/xparser.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/kmplot/kmplot/editfunctionpage.ui b/kmplot/kmplot/editfunctionpage.ui index a1ac0f46..2b6da892 100644 --- a/kmplot/kmplot/editfunctionpage.ui +++ b/kmplot/kmplot/editfunctionpage.ui @@ -402,7 +402,7 @@ Example: f(x)=x^2</string> <signal>completion(const TQString&)</signal> <signal>substringCompletion(const TQString&)</signal> <signal>textRotation(KCompletionBase::KeyBindingType)</signal> - <signal>completionModeChanged(KGlobalSettings::Completion)</signal> + <signal>completionModeChanged(TDEGlobalSettings::Completion)</signal> <signal>aboutToShowContextMenu(TQPopupMenu*)</signal> <slot access="public" specifier="">deleteLater()</slot> <slot access="private" specifier="">cleanupEventFilter(TQObject*)</slot> diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp index 47161609..b8dd8cdb 100644 --- a/kmplot/kmplot/kmplot.cpp +++ b/kmplot/kmplot/kmplot.cpp @@ -207,7 +207,7 @@ void KmPlot::optionsConfigureKeys() void KmPlot::optionsConfigureToolbars() { - saveMainWindowSettings(KGlobal::config() ); + saveMainWindowSettings(TDEGlobal::config() ); // use the standard toolbar editor KEditToolbar dlg(factory()); connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(applyNewToolbarConfig())); @@ -216,7 +216,7 @@ void KmPlot::optionsConfigureToolbars() void KmPlot::applyNewToolbarConfig() { - applyMainWindowSettings(KGlobal::config()); + applyMainWindowSettings(TDEGlobal::config()); } void KmPlot::fileOpen() diff --git a/kmplot/kmplot/kmplot.kcfg b/kmplot/kmplot/kmplot.kcfg index 1963aac3..df9eba38 100644 --- a/kmplot/kmplot/kmplot.kcfg +++ b/kmplot/kmplot/kmplot.kcfg @@ -121,7 +121,7 @@ <entry name="AxesFont" type="String"> <label>Font name of the axis labels</label> <whatsthis>Choose a font name for the axis labels.</whatsthis> - <default code="true">KGlobalSettings::generalFont().family()</default> + <default code="true">TDEGlobalSettings::generalFont().family()</default> </entry> <entry name="AxesFontSize" type="Int"> <label>Font size of the axis labels</label> @@ -131,7 +131,7 @@ <entry name="HeaderTableFont" type="String"> <label>Font name of the printed header table</label> <whatsthis>Choose a font name for the table printed at the top of the page.</whatsthis> - <default code="true">KGlobalSettings::generalFont().family()</default> + <default code="true">TDEGlobalSettings::generalFont().family()</default> </entry> </group> diff --git a/kmplot/kmplot/xparser.cpp b/kmplot/kmplot/xparser.cpp index e7b84fb8..7b5317dc 100644 --- a/kmplot/kmplot/xparser.cpp +++ b/kmplot/kmplot/xparser.cpp @@ -37,7 +37,7 @@ XParser::XParser(bool &mo) : DCOPObject("Parser"), Parser(), m_modified(mo) { // setup slider support - setDecimalSymbol( KGlobal::locale()->decimalSymbol() ); + setDecimalSymbol( TDEGlobal::locale()->decimalSymbol() ); } XParser::~XParser() |