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 --- keduca/keduca/keduca.cpp | 4 ++-- keduca/keduca/keduca_part.cpp | 4 ++-- keduca/keduca/keducaprefs.cpp | 4 ++-- keduca/keduca/keducaview.cpp | 2 +- keduca/keducabuilder/kcontroladdedit.cpp | 4 ++-- keduca/keducabuilder/kcontrolheader.cpp | 8 ++++---- keduca/keducabuilder/keducabuilder.cpp | 6 +++--- keduca/keducabuilder/keducaeditorstartdialog.cpp | 2 +- keduca/libkeduca/fileread.cpp | 22 +++++++++++----------- keduca/libkeduca/fileread.h | 2 +- keduca/libkeduca/kgallerydialog.cpp | 8 ++++---- keduca/libkeduca/kgallerydialog.h | 2 +- 12 files changed, 34 insertions(+), 34 deletions(-) (limited to 'keduca') 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?"), diff --git a/keduca/keducabuilder/kcontroladdedit.cpp b/keduca/keducabuilder/kcontroladdedit.cpp index 0e539d56..913f9ff7 100644 --- a/keduca/keducabuilder/kcontroladdedit.cpp +++ b/keduca/keducabuilder/kcontroladdedit.cpp @@ -225,7 +225,7 @@ void KControlAddEdit::addQuestion() /** Read config settings */ void KControlAddEdit::configRead() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("AddModify Window"); TQSize defaultSize(500,400); resize( config->readSizeEntry("Geometry", &defaultSize ) ); @@ -234,7 +234,7 @@ void KControlAddEdit::configRead() /** Write config settings */ void KControlAddEdit::configWrite() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("AddModify Window"); config->writeEntry("Geometry", size() ); config->sync(); diff --git a/keduca/keducabuilder/kcontrolheader.cpp b/keduca/keducabuilder/kcontrolheader.cpp index bcd1eaa0..ee9b6e35 100644 --- a/keduca/keducabuilder/kcontrolheader.cpp +++ b/keduca/keducabuilder/kcontrolheader.cpp @@ -226,7 +226,7 @@ void KControlHeader::insertHeader() TQStringList tmpResult = _defaultCategories.grep( _headerCategory->currentText() ); if( tmpResult.count() == 0 ) { - KConfig *appconfig = TDEGlobal::config(); + TDEConfig *appconfig = TDEGlobal::config(); _defaultCategories.append( _headerCategory->currentText() ); appconfig->setGroup("General"); appconfig->writeEntry( "Categories", _defaultCategories); @@ -306,8 +306,8 @@ void KControlHeader::slotOk() /** Read settings */ void KControlHeader::configRead() { - KConfig *config = new KConfig("emaildefaults"); - KConfig *appconfig = TDEGlobal::config(); + TDEConfig *config = new TDEConfig("emaildefaults"); + TDEConfig *appconfig = TDEGlobal::config(); config->setGroup("UserInfo"); @@ -369,7 +369,7 @@ void KControlHeader::configRead() /** Write settings */ void KControlHeader::configWrite() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("kcontrolheader"); config->writeEntry("Geometry", size() ); config->sync(); diff --git a/keduca/keducabuilder/keducabuilder.cpp b/keduca/keducabuilder/keducabuilder.cpp index 485a09cc..560677ae 100644 --- a/keduca/keducabuilder/keducabuilder.cpp +++ b/keduca/keducabuilder/keducabuilder.cpp @@ -257,7 +257,7 @@ void KEducaBuilder::slotPreview( TQListBoxItem *item ) /** Read config data */ void KEducaBuilder::configRead() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup( "keducacontrol" ); applyMainWindowSettings( config, "keducacontrol" ); @@ -268,7 +268,7 @@ void KEducaBuilder::configRead() /** Write settings */ void KEducaBuilder::configWrite() { - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup( "keducacontrol" ); saveMainWindowSettings( config, "keducacontrol" ); @@ -445,7 +445,7 @@ bool KEducaBuilder::fileSaveAs() 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?"), diff --git a/keduca/keducabuilder/keducaeditorstartdialog.cpp b/keduca/keducabuilder/keducaeditorstartdialog.cpp index 7878e6c3..6ff7038b 100644 --- a/keduca/keducabuilder/keducaeditorstartdialog.cpp +++ b/keduca/keducabuilder/keducaeditorstartdialog.cpp @@ -53,7 +53,7 @@ void KEducaEditorStartDialog::buildRecentFilesList() TQString key; TQString value; TQString oldGroup; - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); oldGroup = config->group(); diff --git a/keduca/libkeduca/fileread.cpp b/keduca/libkeduca/fileread.cpp index ad72b7e3..24d66339 100644 --- a/keduca/libkeduca/fileread.cpp +++ b/keduca/libkeduca/fileread.cpp @@ -43,7 +43,7 @@ FileRead::~FileRead() bool FileRead::openFile(const KURL &url) { TQString tmpFile; bool returnval=false; - if( KIO::NetAccess::download( url, tmpFile, 0 ) ) + if( TDEIO::NetAccess::download( url, tmpFile, 0 ) ) { returnval=loadFile( tmpFile ); if (returnval) { @@ -51,7 +51,7 @@ bool FileRead::openFile(const KURL &url) { kdDebug()<<"... load successful: "<<_currentURL.url()<name(), copyimages, saveCompressed) ) { // upload the file - KIO::Job * job = KIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (KIO::Job *) ) ); + TDEIO::Job * job = TDEIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (TDEIO::Job *) ) ); return true; } } @@ -804,9 +804,9 @@ bool FileRead::saveFile( const TQString &filename, bool copyimages, bool saveCom if( copyimages == true && copyJOB.count() > 0 ) { KURL::List KurlLIST( copyJOB ); - KIO::CopyJob *copyjob; + TDEIO::CopyJob *copyjob; - copyjob = KIO::copy( KurlLIST, KURL( _currentURL.directory(false,true) ), true); + copyjob = TDEIO::copy( KurlLIST, KURL( _currentURL.directory(false,true) ), true); } _changed=false; return true; @@ -846,8 +846,8 @@ bool FileRead::saveResults( const KURL &url, const TQString &results ) // otherwise, we already had a temp file if( saveResults(_tmpfile->name(), results) ) { // upload the file - KIO::Job * job = KIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ ); - connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (KIO::Job *) ) ); + TDEIO::Job * job = TDEIO::file_copy( KURL::fromPathOrURL( _tmpfile->name() ), _currentURL, -1, true /*overwrite*/ ); + connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotUploadFinished (TDEIO::Job *) ) ); return true; } } @@ -934,7 +934,7 @@ bool FileRead::isResult() return _listResults.count() > 0 ? true : false; } -void FileRead::slotUploadFinished( KIO::Job * job ) +void FileRead::slotUploadFinished( TDEIO::Job * job ) { if (job->error()) { emit canceled( job->errorString() ); diff --git a/keduca/libkeduca/fileread.h b/keduca/libkeduca/fileread.h index dd4caa08..3199f0ad 100644 --- a/keduca/libkeduca/fileread.h +++ b/keduca/libkeduca/fileread.h @@ -232,7 +232,7 @@ protected: bool saveResults( const TQString &filename, const TQString &results ); protected slots: - void slotUploadFinished( KIO::Job * job ); + void slotUploadFinished( TDEIO::Job * job ); signals: /* Stolen from kparts */ diff --git a/keduca/libkeduca/kgallerydialog.cpp b/keduca/libkeduca/kgallerydialog.cpp index 10c6ce43..f7e11da3 100644 --- a/keduca/libkeduca/kgallerydialog.cpp +++ b/keduca/libkeduca/kgallerydialog.cpp @@ -44,7 +44,7 @@ KGalleryDialog::~KGalleryDialog() bool KGalleryDialog::openFile(const KURL &url) { TQString tmpFile; bool returnval=false; - if( KIO::NetAccess::download( url, tmpFile, this ) ) + if( TDEIO::NetAccess::download( url, tmpFile, this ) ) { returnval=loadFile( tmpFile ); if (returnval) { @@ -52,7 +52,7 @@ bool KGalleryDialog::openFile(const KURL &url) { kdDebug()<<"... load successful: "<<_currentURL.url()<setGroup( "kgallerydialog" ); config->writeEntry("Splitter_size", _split->sizes() ); diff --git a/keduca/libkeduca/kgallerydialog.h b/keduca/libkeduca/kgallerydialog.h index cce2acaf..227acd3f 100644 --- a/keduca/libkeduca/kgallerydialog.h +++ b/keduca/libkeduca/kgallerydialog.h @@ -31,7 +31,7 @@ // forward declarations class KTempFile; -namespace KIO { class Job; } +namespace TDEIO { class Job; } class KGalleryDialog : public KGalleryDialogBase { Q_OBJECT -- cgit v1.2.1