From 9f2c757e1a1694373c11427a00502c2ff4c2d403 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:32:27 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kmplot/kmplot/MainDlg.cpp | 20 ++++++++++---------- kmplot/kmplot/MainDlg.h | 6 +++--- kmplot/kmplot/View.h | 2 +- kmplot/kmplot/coordsconfigdialog.cpp | 6 +++--- kmplot/kmplot/coordsconfigdialog.h | 2 +- kmplot/kmplot/kmplot.cpp | 4 ++-- kmplot/kmplot/kmplot.h | 6 +++--- kmplot/kmplot/kmplotio.cpp | 8 ++++---- kmplot/kmplot/kparametereditor.cpp | 12 ++++++------ kmplot/kmplot/ksliderwindow.cpp | 4 ++-- 10 files changed, 35 insertions(+), 35 deletions(-) (limited to 'kmplot') diff --git a/kmplot/kmplot/MainDlg.cpp b/kmplot/kmplot/MainDlg.cpp index 5d69f929..04190ce0 100644 --- a/kmplot/kmplot/MainDlg.cpp +++ b/kmplot/kmplot/MainDlg.cpp @@ -99,7 +99,7 @@ MainDlg::MainDlg(TQWidget *parentWidget, const char *, TQObject *parent, const c m_recentFiles->loadEntries( m_config ); // Let's create a Configure Diloag - m_settingsDialog = new KConfigDialog( parentWidget, "settings", Settings::self() ); + m_settingsDialog = new TDEConfigDialog( parentWidget, "settings", Settings::self() ); m_settingsDialog->setHelp("general-config"); // create and add the page(s) @@ -268,7 +268,7 @@ void MainDlg::slotSaveas() if ( !url.isEmpty() ) { // check if file exists and overwriting is ok. - if( !KIO::NetAccess::exists( url,false,m_parent ) || KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg( url.url()), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) == KMessageBox::Continue ) + if( !TDEIO::NetAccess::exists( url,false,m_parent ) || KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg( url.url()), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) == KMessageBox::Continue ) { if ( !kmplotio->save( url ) ) KMessageBox::error(m_parent, i18n("The file could not be saved") ); @@ -293,7 +293,7 @@ void MainDlg::slotExport() if(!url.isEmpty()) { // check if file exists and overwriting is ok. - if( KIO::NetAccess::exists(url,false,m_parent ) && KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg(url.url() ), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) != KMessageBox::Continue ) return; + if( TDEIO::NetAccess::exists(url,false,m_parent ) && KMessageBox::warningContinueCancel( m_parent, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg(url.url() ), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) != KMessageBox::Continue ) return; if( url.fileName().right(4).lower()==".svg") { @@ -305,7 +305,7 @@ void MainDlg::slotExport() { KTempFile tmp; pic.save( tmp.name(), "SVG"); - if ( !KIO::NetAccess::upload(tmp.name(), url, 0) ) + if ( !TDEIO::NetAccess::upload(tmp.name(), url, 0) ) KMessageBox::error(m_parent, i18n("The URL could not be saved.") ); tmp.unlink(); } @@ -321,7 +321,7 @@ void MainDlg::slotExport() { KTempFile tmp; pic.save( tmp.name(), "BMP"); - if ( !KIO::NetAccess::upload(tmp.name(), url, 0) ) + if ( !TDEIO::NetAccess::upload(tmp.name(), url, 0) ) KMessageBox::error(m_parent, i18n("The URL could not be saved.") ); tmp.unlink(); } @@ -337,7 +337,7 @@ void MainDlg::slotExport() { KTempFile tmp; pic.save( tmp.name(), "PNG"); - if ( !KIO::NetAccess::upload(tmp.name(), url, 0) ) + if ( !TDEIO::NetAccess::upload(tmp.name(), url, 0) ) KMessageBox::error(m_parent, i18n("The URL could not be saved.") ); tmp.unlink(); } @@ -402,7 +402,7 @@ void MainDlg::slotPrint() void MainDlg::editColors() { // create a config dialog and add a colors page - KConfigDialog* colorsDialog = new KConfigDialog( m_parent, "colors", Settings::self() ); + TDEConfigDialog* colorsDialog = new TDEConfigDialog( m_parent, "colors", Settings::self() ); colorsDialog->setHelp("color-config"); colorsDialog->addPage( new SettingsPageColor( 0, "colorSettings" ), i18n( "Colors" ), "colorize", i18n( "Edit Colors" ) ); @@ -428,7 +428,7 @@ void MainDlg::editAxes() void MainDlg::editScaling() { // create a config dialog and add a scaling page - KConfigDialog *scalingDialog = new KConfigDialog( m_parent, "scaling", Settings::self() ); + TDEConfigDialog *scalingDialog = new TDEConfigDialog( m_parent, "scaling", Settings::self() ); scalingDialog->setHelp("scaling-config"); scalingDialog->addPage( new SettingsPageScaling( 0, "scalingSettings" ), i18n( "Scale" ), "scaling", i18n( "Edit Scaling" ) ); // User edited the configuration - update your local copies of the @@ -440,7 +440,7 @@ void MainDlg::editScaling() void MainDlg::editFonts() { // create a config dialog and add a font page - KConfigDialog* fontsDialog = new KConfigDialog( m_parent, "fonts", Settings::self() ); + TDEConfigDialog* fontsDialog = new TDEConfigDialog( m_parent, "fonts", Settings::self() ); fontsDialog->setHelp("font-config"); fontsDialog->addPage( new SettingsPageFonts( 0, "fontsSettings" ), i18n( "Fonts" ), "fonts", i18n( "Edit Fonts" ) ); // User edited the configuration - update your local copies of the @@ -599,7 +599,7 @@ void MainDlg::slotSettings() // An instance of your dialog has already been created and has been cached, // so we want to display the cached dialog instead of creating // another one - KConfigDialog::showDialog( "settings" ); + TDEConfigDialog::showDialog( "settings" ); } void MainDlg::updateSettings() diff --git a/kmplot/kmplot/MainDlg.h b/kmplot/kmplot/MainDlg.h index 9ab99ba2..19370836 100644 --- a/kmplot/kmplot/MainDlg.h +++ b/kmplot/kmplot/MainDlg.h @@ -50,7 +50,7 @@ #include "kmplotio.h" #include "MainDlgIface.h" -class KConfigDialog; +class TDEConfigDialog; class KLineEdit; class KRecentFilesAction; class SettingsPageColor; @@ -167,11 +167,11 @@ private: /// true == modifications not saved bool m_modified; ///An instance of the application config file - KConfig* m_config; + TDEConfig* m_config; ///The KLineEdit which is in the toolbar KLineEdit* m_quickEdit; ///A Configure KmPlot dialog instance - KConfigDialog* m_settingsDialog; + TDEConfigDialog* m_settingsDialog; ///The Precision page for the Configure KmPlot dialog SettingsPagePrecision* m_generalSettings; ///The Constants page for the Configure KmPlot constants diff --git a/kmplot/kmplot/View.h b/kmplot/kmplot/View.h index 7eb09328..b34abf4a 100644 --- a/kmplot/kmplot/View.h +++ b/kmplot/kmplot/View.h @@ -76,7 +76,7 @@ public: /// Reimplemented to draw all stuff to the view. void draw(TQPaintDevice *, int const); - /// Getting all relevant settings using KConfig XT class Settings. + /// Getting all relevant settings using TDEConfig XT class Settings. void getSettings(); /// Clears all functions in the parser and gets default settings. /// @see getSettings diff --git a/kmplot/kmplot/coordsconfigdialog.cpp b/kmplot/kmplot/coordsconfigdialog.cpp index 37e92b16..4a442080 100644 --- a/kmplot/kmplot/coordsconfigdialog.cpp +++ b/kmplot/kmplot/coordsconfigdialog.cpp @@ -33,7 +33,7 @@ #include "coordsconfigdialog.h" CoordsConfigDialog::CoordsConfigDialog(XParser *p, TQWidget *parent) - : KConfigDialog(parent, "coords", Settings::self()), m_parser(p) + : TDEConfigDialog(parent, "coords", Settings::self()), m_parser(p) { configAxesDialog = new SettingsPageCoords( 0, "coordsSettings" ); addPage(configAxesDialog , i18n( "Coords" ), "coords", i18n( "Edit Coordinate System" ) ); @@ -78,13 +78,13 @@ bool CoordsConfigDialog::evalY() void CoordsConfigDialog::slotOk() { if ( !(configAxesDialog->radioButton1_4->isChecked() && !evalX()) && !(configAxesDialog->radioButton1_4_2->isChecked() && !evalY())) - KConfigDialog::slotOk(); + TDEConfigDialog::slotOk(); } void CoordsConfigDialog::slotApply() { if ( !(configAxesDialog->radioButton1_4->isChecked() && !evalX()) && !(configAxesDialog->radioButton1_4_2->isChecked() && !evalY())) - KConfigDialog::slotApply(); + TDEConfigDialog::slotApply(); } #include "coordsconfigdialog.moc" diff --git a/kmplot/kmplot/coordsconfigdialog.h b/kmplot/kmplot/coordsconfigdialog.h index c95b47f5..e480bf53 100644 --- a/kmplot/kmplot/coordsconfigdialog.h +++ b/kmplot/kmplot/coordsconfigdialog.h @@ -36,7 +36,7 @@ class SettingsPageCoords; @author Fredrik Edemar */ /// -class CoordsConfigDialog : public KConfigDialog +class CoordsConfigDialog : public TDEConfigDialog { Q_OBJECT diff --git a/kmplot/kmplot/kmplot.cpp b/kmplot/kmplot/kmplot.cpp index b8dd8cdb..831cb612 100644 --- a/kmplot/kmplot/kmplot.cpp +++ b/kmplot/kmplot/kmplot.cpp @@ -149,14 +149,14 @@ void KmPlot::setupActions() connect( m_fullScreen, TQT_SIGNAL( toggled( bool )), this, TQT_SLOT( slotUpdateFullScreen( bool ))); } -void KmPlot::saveProperties(KConfig* /*config*/) +void KmPlot::saveProperties(TDEConfig* /*config*/) { // the 'config' object points to the session managed // config file. anything you write here will be available // later when this app is restored } -void KmPlot::readProperties(KConfig* /*config*/) +void KmPlot::readProperties(TDEConfig* /*config*/) { // the 'config' object points to the session managed // config file. this function is automatically called whenever diff --git a/kmplot/kmplot/kmplot.h b/kmplot/kmplot/kmplot.h index c8ebad71..6ca68451 100644 --- a/kmplot/kmplot/kmplot.h +++ b/kmplot/kmplot/kmplot.h @@ -71,14 +71,14 @@ protected: * This method is called when it is time for the app to save its * properties for session management purposes. */ - void saveProperties(KConfig *); + void saveProperties(TDEConfig *); /** - * This method is called when this app is restored. The KConfig + * This method is called when this app is restored. The TDEConfig * object points to the session management config file that was saved * with @ref saveProperties */ - void readProperties(KConfig *); + void readProperties(TDEConfig *); /// Quits KmPlot after checking if modifications shall be saved. virtual bool queryClose(); diff --git a/kmplot/kmplot/kmplotio.cpp b/kmplot/kmplot/kmplotio.cpp index 0beb551a..ad9142b2 100644 --- a/kmplot/kmplot/kmplotio.cpp +++ b/kmplot/kmplot/kmplotio.cpp @@ -189,7 +189,7 @@ bool KmPlotIO::save( const KURL &url ) doc.save( ts, 4 ); xmlfile.close(); - if ( !KIO::NetAccess::upload(tmpfile.name(), url,0)) + if ( !TDEIO::NetAccess::upload(tmpfile.name(), url,0)) { tmpfile.unlink(); return false; @@ -224,13 +224,13 @@ bool KmPlotIO::load( const KURL &url ) TQFile f; if ( !url.isLocalFile() ) { - if( !KIO::NetAccess::exists( url, true, 0 ) ) + if( !TDEIO::NetAccess::exists( url, true, 0 ) ) { KMessageBox::error(0,i18n("The file does not exist.")); return false; } TQString tmpfile; - if( !KIO::NetAccess::download( url, tmpfile, 0 ) ) + if( !TDEIO::NetAccess::download( url, tmpfile, 0 ) ) { KMessageBox::error(0,i18n("An error appeared when opening this file")); return false; @@ -289,7 +289,7 @@ bool KmPlotIO::load( const KURL &url ) KMessageBox::error(0,i18n("The file had an unknown version number")); if ( !url.isLocalFile() ) - KIO::NetAccess::removeTempFile( f.name() ); + TDEIO::NetAccess::removeTempFile( f.name() ); return true; } diff --git a/kmplot/kmplot/kparametereditor.cpp b/kmplot/kmplot/kparametereditor.cpp index dd320ac7..50ed3c02 100644 --- a/kmplot/kmplot/kparametereditor.cpp +++ b/kmplot/kmplot/kparametereditor.cpp @@ -138,7 +138,7 @@ void KParameterEditor::cmdImport_clicked() if ( url.isEmpty() ) return; - if (!KIO::NetAccess::exists(url,true,this) ) + if (!TDEIO::NetAccess::exists(url,true,this) ) { KMessageBox::error(0,i18n("The file does not exist.")); return; @@ -149,7 +149,7 @@ void KParameterEditor::cmdImport_clicked() TQString tmpfile; if ( !url.isLocalFile() ) { - if ( !KIO::NetAccess::download(url, tmpfile, this) ) + if ( !TDEIO::NetAccess::download(url, tmpfile, this) ) { KMessageBox::error(0,i18n("An error appeared when opening this file")); return; @@ -182,7 +182,7 @@ void KParameterEditor::cmdImport_clicked() if ( KMessageBox::warningContinueCancel(this,i18n("Line %1 is not a valid parameter value and will therefore not be included. Do you want to continue?").arg(i) ) == KMessageBox::Cancel) { file.close(); - KIO::NetAccess::removeTempFile( tmpfile ); + TDEIO::NetAccess::removeTempFile( tmpfile ); return; } else if (KMessageBox::warningYesNo(this,i18n("Would you like to be informed about other lines that cannot be read?"), TQString(), i18n("Get Informed"), i18n("Ignore Information") ) == KMessageBox::No) @@ -195,7 +195,7 @@ void KParameterEditor::cmdImport_clicked() KMessageBox::error(0,i18n("An error appeared when opening this file")); if ( !url.isLocalFile() ) - KIO::NetAccess::removeTempFile( tmpfile ); + TDEIO::NetAccess::removeTempFile( tmpfile ); } void KParameterEditor::cmdExport_clicked() @@ -206,7 +206,7 @@ void KParameterEditor::cmdExport_clicked() if ( url.isEmpty() ) return; - if( !KIO::NetAccess::exists( url,false,this ) || KMessageBox::warningContinueCancel( this, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg( url.url()), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) == KMessageBox::Continue ) + if( !TDEIO::NetAccess::exists( url,false,this ) || KMessageBox::warningContinueCancel( this, i18n( "A file named \"%1\" already exists. Are you sure you want to continue and overwrite this file?" ).arg( url.url()), i18n( "Overwrite File?" ), KGuiItem( i18n( "&Overwrite" ) ) ) == KMessageBox::Continue ) { TQString tmpfile; TQFile file; @@ -233,7 +233,7 @@ void KParameterEditor::cmdExport_clicked() else KMessageBox::error(0,i18n("An error appeared when saving this file")); - if ( !KIO::NetAccess::upload(tmpfile.name(),url, this) ) + if ( !TDEIO::NetAccess::upload(tmpfile.name(),url, this) ) { KMessageBox::error(0,i18n("An error appeared when saving this file")); tmpfile.unlink(); diff --git a/kmplot/kmplot/ksliderwindow.cpp b/kmplot/kmplot/ksliderwindow.cpp index 0b3e4193..02bc7969 100644 --- a/kmplot/kmplot/ksliderwindow.cpp +++ b/kmplot/kmplot/ksliderwindow.cpp @@ -50,7 +50,7 @@ KSliderWindow::KSliderWindow(TQWidget* parent, int num ) : TQWhatsThis::add( this, i18n( "Move slider to change the parameter of the function plot connected to this slider." ) ); // load the min and max value + the current value - KConfig config( "kmplotrc" ); + TDEConfig config( "kmplotrc" ); config.setGroup( "slider" + TQString::number(num) ); slider->setMinValue( config.readNumEntry( "min", 0) ); slider->setMaxValue( config.readNumEntry( "max", 100) ); @@ -70,7 +70,7 @@ KSliderWindow::KSliderWindow(TQWidget* parent, int num ) : KSliderWindow::~KSliderWindow() { // save the min and max value + the current value - KConfig config( "kmplotrc" ); + TDEConfig config( "kmplotrc" ); config.setGroup( "slider" + TQString::number(m_num) ); config.writeEntry( "min", slider->minValue() ); config.writeEntry( "max", slider->maxValue() ); -- cgit v1.2.1