diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:32:27 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-25 00:32:27 -0600 |
commit | 9f2c757e1a1694373c11427a00502c2ff4c2d403 (patch) | |
tree | 7d90e91214976a7d23d89ec3474515cf46069704 /keduca/keduca | |
parent | cee429821aa6f1acc97fb482d325fb4eb37376ca (diff) | |
download | tdeedu-9f2c757e1a1694373c11427a00502c2ff4c2d403.tar.gz tdeedu-9f2c757e1a1694373c11427a00502c2ff4c2d403.zip |
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'keduca/keduca')
-rw-r--r-- | keduca/keduca/keduca.cpp | 4 | ||||
-rw-r--r-- | keduca/keduca/keduca_part.cpp | 4 | ||||
-rw-r--r-- | keduca/keduca/keducaprefs.cpp | 4 | ||||
-rw-r--r-- | keduca/keduca/keducaview.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/keduca/keduca/keduca.cpp b/keduca/keduca/keduca.cpp index 63a96d27..b6afc115 100644 --- a/keduca/keduca/keduca.cpp +++ b/keduca/keduca/keduca.cpp @@ -97,7 +97,7 @@ bool Keduca::queryClose() void Keduca::configRead() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup( "keduca" ); applyMainWindowSettings( config, "keduca" ); _recentFiles->loadEntries(config); @@ -105,7 +105,7 @@ void Keduca::configRead() void Keduca::configWrite() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup( "keduca" ); saveMainWindowSettings( config, "keduca" ); diff --git a/keduca/keduca/keduca_part.cpp b/keduca/keduca/keduca_part.cpp index 1d3631cc..aa61d65c 100644 --- a/keduca/keduca/keduca_part.cpp +++ b/keduca/keduca/keduca_part.cpp @@ -76,10 +76,10 @@ void KEducaPart::setupActions() void KEducaPart::slotConfigure() { - if ( KConfigDialog::showDialog( "KEducaSettings" ) ) + if ( TDEConfigDialog::showDialog( "KEducaSettings" ) ) return; - KConfigDialog *dialog = new KConfigDialog( widget(), "KEducaSettings", Settings::self() ); + TDEConfigDialog *dialog = new TDEConfigDialog( widget(), "KEducaSettings", Settings::self() ); ConfigDialogBase *confDlg = new ConfigDialogBase( 0, "ConfigDialogBase" ); dialog->addPage( confDlg, i18n("General"), "keduca" ); diff --git a/keduca/keduca/keducaprefs.cpp b/keduca/keduca/keducaprefs.cpp index 3bddf2e7..b2c28e34 100644 --- a/keduca/keduca/keducaprefs.cpp +++ b/keduca/keduca/keducaprefs.cpp @@ -82,7 +82,7 @@ void KEducaPrefs::setPageGeneral() /** Read settings */ void KEducaPrefs::configRead() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Options"); TQSize defaultSize(500,400); resize( config->readSizeEntry("Geometry", &defaultSize ) ); @@ -94,7 +94,7 @@ void KEducaPrefs::configRead() /** Write settings */ void KEducaPrefs::configWrite() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("Options"); config->writeEntry("Geometry", size() ); config->writeEntry("ResultFinish", _resultAfterFinish->isChecked() ); diff --git a/keduca/keduca/keducaview.cpp b/keduca/keduca/keducaview.cpp index 9a6813d5..69020fe1 100644 --- a/keduca/keduca/keducaview.cpp +++ b/keduca/keduca/keducaview.cpp @@ -176,7 +176,7 @@ void KEducaView::slotButtonSave() newURL.setPath( newURL.path() + extension ); } - if ( KIO::NetAccess::exists( newURL, false, this ) ) { // this file exists => ask for confirmation + if ( TDEIO::NetAccess::exists( newURL, false, this ) ) { // this file exists => ask for confirmation bOk = KMessageBox::warningContinueCancel( this, i18n("A document with this name already exists.\n"\ "Do you want to overwrite it?"), |