From 4bb787f41f7cdefac2aac33ef59317b7157302c1 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:38:13 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- ark/ark_part.cpp | 16 ++++++------- ark/ark_part.h | 8 +++---- ark/arkutils.cpp | 6 ++--- ark/arkutils.h | 4 ++-- ark/arkwidget.cpp | 38 +++++++++++++++--------------- ark/arkwidget.h | 6 ++--- ark/compressedfile.cpp | 10 ++++---- ark/filelistview.cpp | 12 +++++----- ark/filelistview.h | 12 +++++----- ark/mainwindow.cpp | 8 +++---- ark/mainwindow.h | 4 ++-- charselectapplet/charselectapplet.cpp | 4 ++-- kcalc/kcalc.cpp | 4 ++-- kcalc/kcalc_settings.kcfgc | 2 +- kcharselect/kcharselectdia.cc | 2 +- kcharselect/main.cc | 2 +- kdelirc/kcmlirc/kcmlirc.cpp | 6 ++--- kdelirc/kcmlirc/kcmlirc.h | 2 +- kdelirc/kdelirc/iraction.cpp | 4 ++-- kdelirc/kdelirc/iraction.h | 6 ++--- kdelirc/kdelirc/iractions.cpp | 6 ++--- kdelirc/kdelirc/iractions.h | 8 +++---- kdelirc/kdelirc/mode.cpp | 4 ++-- kdelirc/kdelirc/mode.h | 6 ++--- kdelirc/kdelirc/modes.cpp | 6 ++--- kdelirc/kdelirc/modes.h | 8 +++---- kdessh/kdessh.cpp | 2 +- kdf/disklist.cpp | 4 ++-- kdf/disklist.h | 2 +- kdf/disks.h | 6 ++--- kdf/kcmdf.cpp | 6 ++--- kdf/kcmdf.h | 2 +- kdf/kconftest.cpp | 2 +- kdf/kdfconfig.cpp | 4 ++-- kdf/kdfwidget.cpp | 8 +++---- kdf/mntconfig.cpp | 4 ++-- kdf/stdoption.cpp | 6 ++--- kedit/kedit.cpp | 32 ++++++++++++------------- kedit/kedit.h | 12 +++++----- kfloppy/floppy.h | 4 ++-- kfloppy/zip.cpp | 4 ++-- kfloppy/zip.h | 6 ++--- kgpg/kgpg.cpp | 4 ++-- kgpg/kgpgeditor.cpp | 8 +++---- kgpg/kgpginterface.cpp | 6 ++--- kgpg/kgpglibrary.cpp | 10 ++++---- kgpg/kgpglibrary.h | 2 +- kgpg/kgpgoptions.cpp | 4 ++-- kgpg/kgpgoptions.h | 8 +++---- kgpg/kgpgsettings.kcfgc | 2 +- kgpg/kgpgview.cpp | 12 +++++----- kgpg/listkeys.cpp | 12 +++++----- kgpg/popuppublic.h | 2 +- khexedit/dialog.cc | 16 ++++++------- khexedit/hexeditorwidget.cc | 10 ++++---- khexedit/hexeditorwidget.h | 6 ++--- khexedit/hextoolwidget.cc | 4 ++-- khexedit/hextoolwidget.h | 4 ++-- khexedit/stringdialog.cc | 4 ++-- khexedit/toplevel.cc | 10 ++++---- khexedit/toplevel.h | 4 ++-- kjots/KJotsMain.cpp | 8 +++---- kjots/KJotsSettings.kcfgc | 2 +- kjots/kjotsentry.cpp | 20 ++++++++-------- kjots/kjotsentry.h | 10 ++++---- kjots/main.cpp | 2 +- klaptopdaemon/acpi.cpp | 4 ++-- klaptopdaemon/acpi.h | 6 ++--- klaptopdaemon/apm.cpp | 4 ++-- klaptopdaemon/apm.h | 6 ++--- klaptopdaemon/battery.cpp | 4 ++-- klaptopdaemon/battery.h | 6 ++--- klaptopdaemon/buttons.cpp | 4 ++-- klaptopdaemon/buttons.h | 6 ++--- klaptopdaemon/daemon_state.cpp | 2 +- klaptopdaemon/daemondock.cpp | 6 ++--- klaptopdaemon/laptop_daemon.cpp | 2 +- klaptopdaemon/main.cpp | 28 +++++++++++----------- klaptopdaemon/main.h | 2 +- klaptopdaemon/pcmcia.cpp | 4 ++-- klaptopdaemon/pcmcia.h | 2 +- klaptopdaemon/portable.cpp | 10 ++++---- klaptopdaemon/portable.h | 2 +- klaptopdaemon/power.cpp | 4 ++-- klaptopdaemon/power.h | 6 ++--- klaptopdaemon/profile.cpp | 4 ++-- klaptopdaemon/profile.h | 6 ++--- klaptopdaemon/sony.cpp | 4 ++-- klaptopdaemon/sony.h | 6 ++--- klaptopdaemon/warning.cpp | 4 ++-- klaptopdaemon/warning.h | 6 ++--- kmilo/generic/generic_monitor.cpp | 6 ++--- kmilo/generic/generic_monitor.h | 4 ++-- kmilo/kmilo_kvaio/kcmkvaio/main.cpp | 6 ++--- kmilo/kmilo_kvaio/kcmkvaio/main.h | 2 +- kmilo/kmilo_kvaio/kmilo_kvaio.cpp | 2 +- kmilo/kmilo_kvaio/kmilo_kvaio.h | 2 +- kmilo/kmilo_kvaio/kvaio.cpp | 4 ++-- kmilo/kmilo_kvaio/kvaio.h | 2 +- kmilo/kmilod/defaultskin.cpp | 4 ++-- kmilo/kmilod/defaultskin.h | 2 +- kmilo/kmilod/kmilod.cpp | 2 +- kmilo/kmilod/monitor.cpp | 2 +- kmilo/kmilod/monitor.h | 4 ++-- kmilo/thinkpad/kcmthinkpad/main.cpp | 6 ++--- kmilo/thinkpad/kcmthinkpad/main.h | 2 +- kmilo/thinkpad/thinkpad.cpp | 4 ++-- kmilo/thinkpad/thinkpad.h | 2 +- ksim/ksimview.cpp | 4 ++-- ksim/ksimview.h | 4 ++-- ksim/library/ksimconfig.cpp | 6 ++--- ksim/library/ksimconfig.h | 8 +++---- ksim/library/pluginmodule.cpp | 12 +++++----- ksim/library/pluginmodule.h | 6 ++--- ksim/library/themeloader.cpp | 20 ++++++++-------- ksim/library/themeloader.h | 6 ++--- ksim/monitors/i8k/ksimi8k.cpp | 10 ++++---- ksim/monitors/i8k/ksimi8k.h | 6 ++--- ksim/monitors/lm_sensors/ksimsensors.h | 2 +- ksim/monitors/snmp/chartmonitor.cpp | 2 +- ksim/monitors/snmp/configpage.cpp | 6 ++--- ksim/monitors/snmp/hostconfig.cpp | 10 ++++---- ksim/monitors/snmp/hostconfig.h | 12 +++++----- ksim/monitors/snmp/monitorconfig.cpp | 8 +++---- ksim/monitors/snmp/monitorconfig.h | 10 ++++---- ksim/monitors/snmp/view.cpp | 2 +- ktimer/ktimer.cpp | 8 +++---- ktimer/ktimer.h | 8 +++---- kwallet/allyourbase.cpp | 14 +++++------ kwallet/konfigurator/konfigurator.cpp | 8 +++---- kwallet/konfigurator/konfigurator.h | 6 ++--- kwallet/kwalleteditor.cpp | 22 ++++++++--------- kwallet/kwalletmanager.cpp | 10 ++++---- superkaramba/ChangeLog | 4 ++-- superkaramba/src/imagelabel.cpp | 26 ++++++++++---------- superkaramba/src/imagelabel.h | 4 ++-- superkaramba/src/karamba.cpp | 8 +++---- superkaramba/src/karamba.h | 6 ++--- superkaramba/src/karambaapp.cpp | 2 +- superkaramba/src/karambasessionmanaged.cpp | 2 +- superkaramba/src/rsssensor.cpp | 6 ++--- superkaramba/src/sknewstuff.cpp | 4 ++-- superkaramba/src/taskbartest.cpp | 2 +- superkaramba/src/taskmanager.cpp | 2 +- superkaramba/src/themefile.cpp | 2 +- superkaramba/src/themelocale.cpp | 2 +- superkaramba/src/themesdlg.cpp | 16 ++++++------- 147 files changed, 479 insertions(+), 479 deletions(-) diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp index 77d329b..afd416f 100644 --- a/ark/ark_part.cpp +++ b/ark/ark_part.cpp @@ -102,7 +102,7 @@ ArkPart::ArkPart( TQWidget *parentWidget, const char * /*widgetName*/, TQObject TQT_SLOT( slotSetBusy( const TQString & ) ) ); connect( awidget, TQT_SIGNAL( setReady() ), m_bar, TQT_SLOT( slotSetReady() ) ); - connect( this, TQT_SIGNAL( started(KIO::Job*) ), TQT_SLOT( transferStarted(KIO::Job*) ) ); + connect( this, TQT_SIGNAL( started(TDEIO::Job*) ), TQT_SLOT( transferStarted(TDEIO::Job*) ) ); connect( this, TQT_SIGNAL( completed() ), TQT_SLOT( transferCompleted() ) ); connect( this, TQT_SIGNAL( canceled(const TQString&) ), TQT_SLOT( transferCanceled(const TQString&) ) ); @@ -246,7 +246,7 @@ void ArkPart::disableActions() bool ArkPart::openURL( const KURL & url ) { awidget->setRealURL( url ); - return KParts::ReadWritePart::openURL( KIO::NetAccess::mostLocalURL( url, awidget ) ); + return KParts::ReadWritePart::openURL( TDEIO::NetAccess::mostLocalURL( url, awidget ) ); } bool ArkPart::openFile() @@ -322,7 +322,7 @@ void ArkPart::slotFilePopup( const TQPoint &pPoint ) static_cast(factory()->container("file_popup", this))->popup(pPoint); } -void ArkPart::transferStarted( KIO::Job *job ) +void ArkPart::transferStarted( TDEIO::Job *job ) { m_job = job; @@ -332,8 +332,8 @@ void ArkPart::transferStarted( KIO::Job *job ) if ( job ) { disableActions(); - connect( job, TQT_SIGNAL( percent(KIO::Job*, unsigned long) ), - TQT_SLOT( progressInformation(KIO::Job*, unsigned long) ) ); + connect( job, TQT_SIGNAL( percent(TDEIO::Job*, unsigned long) ), + TQT_SLOT( progressInformation(TDEIO::Job*, unsigned long) ) ); connect( m_bar->cancelButton(), TQT_SIGNAL( clicked() ), TQT_SLOT( cancelTransfer() ) ); } @@ -343,8 +343,8 @@ void ArkPart::transferCompleted() { if ( m_job ) { - disconnect( m_job, TQT_SIGNAL( percent(KIO::Job*, unsigned long) ), - this, TQT_SLOT( progressInformation(KIO::Job*, unsigned long) ) ); + disconnect( m_job, TQT_SIGNAL( percent(TDEIO::Job*, unsigned long) ), + this, TQT_SLOT( progressInformation(TDEIO::Job*, unsigned long) ) ); m_job = 0; } @@ -362,7 +362,7 @@ void ArkPart::transferCanceled( const TQString& errMsg ) m_bar->slotSetReady(); } -void ArkPart::progressInformation( KIO::Job *, unsigned long progress ) +void ArkPart::progressInformation( TDEIO::Job *, unsigned long progress ) { m_bar->setProgress( progress ); } diff --git a/ark/ark_part.h b/ark/ark_part.h index 5dce97c..6ec3202 100644 --- a/ark/ark_part.h +++ b/ark/ark_part.h @@ -37,7 +37,7 @@ class KPushButton; class ArkWidget; -namespace KIO +namespace TDEIO { class Job; } @@ -104,10 +104,10 @@ public slots: bool saveFile(); bool openURL( const KURL & url ); bool closeURL(); - void transferStarted( KIO::Job * ); + void transferStarted( TDEIO::Job * ); void transferCompleted(); void transferCanceled( const TQString& errMsg ); - void progressInformation( KIO::Job *, unsigned long ); + void progressInformation( TDEIO::Job *, unsigned long ); void cancelTransfer(); signals: @@ -146,7 +146,7 @@ private: KAction *popupOpenWithAction; KToggleAction *showSearchBar; - KIO::Job *m_job; + TDEIO::Job *m_job; }; #endif // ARK_PART_H diff --git a/ark/arkutils.cpp b/ark/arkutils.cpp index 210f9bb..52049d0 100644 --- a/ark/arkutils.cpp +++ b/ark/arkutils.cpp @@ -186,7 +186,7 @@ ArkUtils::haveDirPermissions( const TQString &strFile ) } bool -ArkUtils::diskHasSpace(const TQString &dir, KIO::filesize_t size) +ArkUtils::diskHasSpace(const TQString &dir, TDEIO::filesize_t size) // check if disk has enough space to accommodate (a) new file(s) of // the given size in the partition containing the given directory { @@ -211,10 +211,10 @@ ArkUtils::diskHasSpace(const TQString &dir, KIO::filesize_t size) return true; } -KIO::filesize_t +TDEIO::filesize_t ArkUtils::getSizes(TQStringList *list) { - KIO::filesize_t sum = 0; + TDEIO::filesize_t sum = 0; TQString str; KDE_struct_stat st; diff --git a/ark/arkutils.h b/ark/arkutils.h index b8a040c..baed64b 100644 --- a/ark/arkutils.h +++ b/ark/arkutils.h @@ -49,8 +49,8 @@ namespace ArkUtils const TQString &day, const TQString &year); bool haveDirPermissions(const TQString &strFile); - bool diskHasSpace(const TQString &dir, KIO::filesize_t size); - KIO::filesize_t getSizes(TQStringList *list); + bool diskHasSpace(const TQString &dir, TDEIO::filesize_t size); + TDEIO::filesize_t getSizes(TQStringList *list); } #endif diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp index 6a40e4a..5931f8b 100644 --- a/ark/arkwidget.cpp +++ b/ark/arkwidget.cpp @@ -199,7 +199,7 @@ ArkWidget::updateStatusTotals() m_nSizeOfFiles = m_fileListView->totalSize(); TQString strInfo = i18n( "%n file %1", "%n files %1", m_nNumFiles ) - .arg( KIO::convertSize( m_nSizeOfFiles ) ); + .arg( TDEIO::convertSize( m_nSizeOfFiles ) ); emit setStatusBarText(strInfo); } @@ -287,7 +287,7 @@ ArkWidget::getSaveAsFileName() bool ArkWidget::file_save_as( const KURL & u ) { - bool success = KIO::NetAccess::upload( m_strArchName, u, this ); + bool success = TDEIO::NetAccess::upload( m_strArchName, u, this ); if ( m_modified && success ) m_modified = false; return success; @@ -388,7 +388,7 @@ ArkWidget::convertFinish() } else { - KIO::NetAccess::upload( tmpDir() + TDEIO::NetAccess::upload( tmpDir() + m_convert_saveAsURL.fileName(), m_convert_saveAsURL, this ); // TODO: save bandwidth - we already have a local tmp file ... emit openURLRequest( m_convert_saveAsURL ); @@ -427,9 +427,9 @@ ArkWidget::extractTo( const KURL & targetDirectory, const KURL & archive, bool b m_extractTo_targetDirectory.setPath( targetDirectory.path( 1 ) + fileName + '/' ); } - if ( !KIO::NetAccess::exists( m_extractTo_targetDirectory, false, this ) ) + if ( !TDEIO::NetAccess::exists( m_extractTo_targetDirectory, false, this ) ) { - if ( !KIO::NetAccess::mkdir( m_extractTo_targetDirectory, this ) ) + if ( !TDEIO::NetAccess::mkdir( m_extractTo_targetDirectory, this ) ) { KMessageBox::error( 0, i18n( "Could not create the folder %1" ).arg( targetDirectory.prettyURL() ) ); @@ -548,7 +548,7 @@ ArkWidget::addToArchive( const KURL::List & filesToAdd, const KURL & archive) { m_addToArchive_filesToAdd = filesToAdd; m_addToArchive_archive = archive; - if ( !KIO::NetAccess::exists( archive, false, this ) ) + if ( !TDEIO::NetAccess::exists( archive, false, this ) ) { if ( !m_openAsMimeType.isEmpty() ) { @@ -676,7 +676,7 @@ ArkWidget::addToArchiveSlotAddDone( bool success ) KMessageBox::error( this, i18n( "An error occurred while adding the files to the archive." ) ); } if ( !m_addToArchive_archive.isLocalFile() ) - KIO::NetAccess::upload( m_strArchName, m_addToArchive_archive, this ); + TDEIO::NetAccess::upload( m_strArchName, m_addToArchive_archive, this ); emit request_file_quit(); return; } @@ -918,15 +918,15 @@ ArkWidget::extractRemoteInitiateMoving( const KURL & target ) m_extractURL.adjustPath( 1 ); - KIO::CopyJob *job = KIO::copy( srcList, target, this ); - connect( job, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotExtractRemoteDone(KIO::Job*)) ); + TDEIO::CopyJob *job = TDEIO::copy( srcList, target, this ); + connect( job, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotExtractRemoteDone(TDEIO::Job*)) ); m_extractRemote = false; } void -ArkWidget::slotExtractRemoteDone(KIO::Job *job) +ArkWidget::slotExtractRemoteDone(TDEIO::Job *job) { delete m_extractRemoteTmpDir; m_extractRemoteTmpDir = NULL; @@ -1008,7 +1008,7 @@ ArkWidget::createRealArchive( const TQString & strFilename, const TQStringList & u1.setPath( m_compressedFile ); m_createRealArchTmpDir = new KTempDir( tmpDir() + "create_real_arch" ); u2.setPath( m_createRealArchTmpDir->name() + u1.fileName() ); - KIO::NetAccess::copy( u1, u2, this ); + TDEIO::NetAccess::copy( u1, u2, this ); m_compressedFile = "file:" + u2.path(); // AGAIN THE 5 SPACES Hack :-( connect( newArch, TQT_SIGNAL( sigCreate( Arch *, bool, const TQString &, int ) ), this, TQT_SLOT( createRealArchiveSlotCreate( Arch *, bool, @@ -1212,7 +1212,7 @@ ArkWidget::toLocalFile( const KURL& url ) tempfile += strURL.right(strURL.length() - strURL.findRev("/") - 1); deleteAfterUse(tempfile); // remember for deletion KURL tempurl; tempurl.setPath( tempfile ); - if( !KIO::NetAccess::dircopy(url, tempurl, this) ) + if( !TDEIO::NetAccess::dircopy(url, tempurl, this) ) return KURL(); localURL = tempfile; } @@ -1439,7 +1439,7 @@ ArkWidget::action_extract() fileToExtract.setPath( arch->fileName() ); //before we start, make sure the archive is still there - if (!KIO::NetAccess::exists( fileToExtract.prettyURL(), true, this ) ) + if (!TDEIO::NetAccess::exists( fileToExtract.prettyURL(), true, this ) ) { KMessageBox::error(0, i18n("The archive to extract from no longer exists.")); return false; @@ -1531,7 +1531,7 @@ ArkWidget::action_extract() } else { - KIO::filesize_t nTotalSize = 0; + TDEIO::filesize_t nTotalSize = 0; // make a list to send to unarchFile TQStringList selectedFiles = m_fileListView->selectedFilenames(); for ( TQStringList::const_iterator it = selectedFiles.constBegin(); @@ -1842,12 +1842,12 @@ ArkWidget::updateStatusSelection() { strInfo = i18n("%1 files selected %2") .arg(TDEGlobal::locale()->formatNumber(m_nNumSelectedFiles, 0)) - .arg(KIO::convertSize(m_nSizeOfSelectedFiles)); + .arg(TDEIO::convertSize(m_nSizeOfSelectedFiles)); } else { strInfo = i18n("1 file selected %2") - .arg(KIO::convertSize(m_nSizeOfSelectedFiles)); + .arg(TDEIO::convertSize(m_nSizeOfSelectedFiles)); } emit setStatusBarSelectedFiles(strInfo); @@ -2266,10 +2266,10 @@ void ArkWidget::slotShowSearchBarToggled( bool b ) * Show Settings dialog. */ void ArkWidget::showSettings(){ - if(KConfigDialog::showDialog("settings")) + if(TDEConfigDialog::showDialog("settings")) return; - KConfigDialog *dialog = new KConfigDialog(this, "settings", ArkSettings::self()); + TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", ArkSettings::self()); General* genPage = new General(0, "General"); dialog->addPage(genPage, i18n("General"), "ark", i18n("General Settings")); diff --git a/ark/arkwidget.h b/ark/arkwidget.h index 59d3ea7..11f6a95 100644 --- a/ark/arkwidget.h +++ b/ark/arkwidget.h @@ -131,7 +131,7 @@ protected slots: void slotCreate(Arch *, bool, const TQString &, int); void slotDeleteDone(bool); void slotExtractDone(bool); - void slotExtractRemoteDone(KIO::Job *job); + void slotExtractRemoteDone(TDEIO::Job *job); void slotAddDone(bool); void slotEditFinished(TDEProcess *); void slotTestDone(bool); @@ -302,8 +302,8 @@ private: // data ArchType m_archType; FileListView * m_fileListView; - KIO::filesize_t m_nSizeOfFiles; - KIO::filesize_t m_nSizeOfSelectedFiles; + TDEIO::filesize_t m_nSizeOfFiles; + TDEIO::filesize_t m_nSizeOfSelectedFiles; unsigned int m_nNumFiles; int m_nNumSelectedFiles; int m_arkInstanceId; diff --git a/ark/compressedfile.cpp b/ark/compressedfile.cpp index 00d6a9d..2688f6c 100644 --- a/ark/compressedfile.cpp +++ b/ark/compressedfile.cpp @@ -178,10 +178,10 @@ void CompressedFile::open() src.setPath( m_filename ); target.setPath( m_tmpfile ); - KIO::NetAccess::copy( src, target, m_gui ); + TDEIO::NetAccess::copy( src, target, m_gui ); kdDebug(1601) << "Temp file name is " << target << endl; - if ( !KIO::NetAccess::exists( target, true, NULL ) ) + if ( !TDEIO::NetAccess::exists( target, true, NULL ) ) return; TDEProcess *kp = m_currentProcess = new TDEProcess; @@ -246,15 +246,15 @@ void CompressedFile::slotUncompressDone(TDEProcess *_kp) KURL url; url.setPath( m_tmpdir + lst.first() ); m_tmpfile = url.path(); - KIO::UDSEntry udsInfo; - KIO::NetAccess::stat( url, udsInfo, m_gui ); + TDEIO::UDSEntry udsInfo; + TDEIO::NetAccess::stat( url, udsInfo, m_gui ); KFileItem fileItem( udsInfo, url ); TQStringList list; list << fileItem.name(); list << fileItem.permissionsString(); list << fileItem.user(); list << fileItem.group(); - list << KIO::number( fileItem.size() ); + list << TDEIO::number( fileItem.size() ); m_gui->fileList()->addItem(list); // send to GUI emit sigOpen( this, bSuccess, m_filename, diff --git a/ark/filelistview.cpp b/ark/filelistview.cpp index 16bcf8d..384a259 100644 --- a/ark/filelistview.cpp +++ b/ark/filelistview.cpp @@ -138,12 +138,12 @@ void FileLVI::setText( int column, const TQString &text ) else if ( colName == sizeCol ) { m_fileSize = text.toULongLong(); - TQListViewItem::setText( column, KIO::convertSize( m_fileSize ) ); + TQListViewItem::setText( column, TDEIO::convertSize( m_fileSize ) ); } else if ( colName == packedStrCol ) { m_packedFileSize = text.toULongLong(); - TQListViewItem::setText( column, KIO::convertSize( m_packedFileSize ) ); + TQListViewItem::setText( column, TDEIO::convertSize( m_packedFileSize ) ); } else if ( colName == ratioStrCol ) { @@ -470,9 +470,9 @@ int FileListView::selectedFilesCount() return numFiles; } -KIO::filesize_t FileListView::totalSize() +TDEIO::filesize_t FileListView::totalSize() { - KIO::filesize_t size = 0; + TDEIO::filesize_t size = 0; TQListViewItemIterator it(this); while ( it.current() ) @@ -485,9 +485,9 @@ KIO::filesize_t FileListView::totalSize() return size; } -KIO::filesize_t FileListView::selectedSize() +TDEIO::filesize_t FileListView::selectedSize() { - KIO::filesize_t size = 0; + TDEIO::filesize_t size = 0; TQListViewItemIterator it( this, TQListViewItemIterator::Selected ); while ( it.current() ) diff --git a/ark/filelistview.h b/ark/filelistview.h index 88a9546..d3479f1 100644 --- a/ark/filelistview.h +++ b/ark/filelistview.h @@ -52,8 +52,8 @@ class FileLVI : public KListViewItem FileLVI( KListViewItem* lvi ); TQString fileName() const { return m_entryName; } - KIO::filesize_t fileSize() const { return m_fileSize; } - KIO::filesize_t packedFileSize() const { return m_packedFileSize; } + TDEIO::filesize_t fileSize() const { return m_fileSize; } + TDEIO::filesize_t packedFileSize() const { return m_packedFileSize; } double ratio() const { return m_ratio; } TQDateTime timeStamp() const { return m_timeStamp; } @@ -62,8 +62,8 @@ class FileLVI : public KListViewItem virtual void setText( int column, const TQString &text ); private: - KIO::filesize_t m_fileSize; - KIO::filesize_t m_packedFileSize; + TDEIO::filesize_t m_fileSize; + TDEIO::filesize_t m_packedFileSize; double m_ratio; TQDateTime m_timeStamp; TQString m_entryName; @@ -125,12 +125,12 @@ class FileListView: public KListView /** * Return the sum of the sizes of all files in the archive. */ - KIO::filesize_t totalSize(); + TDEIO::filesize_t totalSize(); /** * Return the sum of the sizes of the selected files. */ - KIO::filesize_t selectedSize(); + TDEIO::filesize_t selectedSize(); /** * Adjust the size of all columns to fit their content. diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp index 7096833..2c9a957 100644 --- a/ark/mainwindow.cpp +++ b/ark/mainwindow.cpp @@ -344,7 +344,7 @@ MainWindow::slotSaveProperties() } void -MainWindow::saveProperties( KConfig* config ) +MainWindow::saveProperties( TDEConfig* config ) { //TODO: make it work for URLS config->writePathEntry( "SMOpenedFile",m_widget->getArchName() ); @@ -353,10 +353,10 @@ MainWindow::saveProperties( KConfig* config ) void -MainWindow::readProperties( KConfig* config ) +MainWindow::readProperties( TDEConfig* config ) { TQString file = config->readPathEntry("SMOpenedFile"); - kdDebug(1601) << "ArkWidget::readProperties( KConfig* config ) file=" << file << endl; + kdDebug(1601) << "ArkWidget::readProperties( TDEConfig* config ) file=" << file << endl; if ( !file.isEmpty() ) openURL( KURL::fromPathOrURL( file ) ); } @@ -433,7 +433,7 @@ MainWindow::addToArchive( const KURL::List & filesToAdd, const TQString & /*cwd* startProgressDialog( i18n( "Compressing..." ) ); - bool exists = KIO::NetAccess::exists( archiveFile, false, m_widget ); + bool exists = TDEIO::NetAccess::exists( archiveFile, false, m_widget ); kdDebug( 1601 ) << archiveFile << endl; if ( !m_widget->addToArchive( filesToAdd, archiveFile ) ) diff --git a/ark/mainwindow.h b/ark/mainwindow.h index ca3abb2..d448e8c 100644 --- a/ark/mainwindow.h +++ b/ark/mainwindow.h @@ -63,8 +63,8 @@ public slots: void file_close(); void slotNewToolbarConfig(); void slotConfigureKeyBindings(); - virtual void saveProperties( KConfig* config ); - virtual void readProperties( KConfig* config ); + virtual void saveProperties( TDEConfig* config ); + virtual void readProperties( TDEConfig* config ); void slotSaveProperties(); void slotArchivePopup( const TQPoint &pPoint); void slotRemoveRecentURL( const KURL &url ); diff --git a/charselectapplet/charselectapplet.cpp b/charselectapplet/charselectapplet.cpp index 0c88b95..6803562 100644 --- a/charselectapplet/charselectapplet.cpp +++ b/charselectapplet/charselectapplet.cpp @@ -60,7 +60,7 @@ CharSelectApplet::CharSelectApplet(const TQString& configFile, Type type, int ac _aboutData(0), _configDialog(0) { // read configuration - KConfig *c = config(); + TDEConfig *c = config(); c->setGroup("General"); cell_width = c->readNumEntry("CellWidth", cell_width); cell_height = c->readNumEntry("CellHeight", cell_height); @@ -128,7 +128,7 @@ void CharSelectApplet::preferences() emit updateLayout(); // write configuration - KConfig *c = config(); + TDEConfig *c = config(); c->setGroup("General"); c->writeEntry("CellWidth", cell_width); c->writeEntry("CellHeight", cell_height); diff --git a/kcalc/kcalc.cpp b/kcalc/kcalc.cpp index 8e1b7d2..c3665c8 100644 --- a/kcalc/kcalc.cpp +++ b/kcalc/kcalc.cpp @@ -1809,11 +1809,11 @@ void KCalculator::showSettings() { // Check if there is already a dialog and if so bring // it to the foreground. - if(KConfigDialog::showDialog("settings")) + if(TDEConfigDialog::showDialog("settings")) return; // Create a new dialog with the same name as the above checking code. - KConfigDialog *dialog = new KConfigDialog(this, "settings", KCalcSettings::self()); + TDEConfigDialog *dialog = new TDEConfigDialog(this, "settings", KCalcSettings::self()); dialog->enableButtonSeparator( true ); // Add the general page. Store the settings in the General group and diff --git a/kcalc/kcalc_settings.kcfgc b/kcalc/kcalc_settings.kcfgc index 3dafab6..1ee30f0 100644 --- a/kcalc/kcalc_settings.kcfgc +++ b/kcalc/kcalc_settings.kcfgc @@ -3,6 +3,6 @@ File=kcalc.kcfg ClassName=KCalcSettings Singleton=true Mutators=ShowStat,ShowScientific,ShowLogic,ShowConstants,nameConstant,valueConstant -# Inherits=KConfigSkeleton +# Inherits=TDEConfigSkeleton # IncludeFiles=libtdepim/kpimprefs.h # MemberVariables=public diff --git a/kcharselect/kcharselectdia.cc b/kcharselect/kcharselectdia.cc index cafdab3..8d6b399 100644 --- a/kcharselect/kcharselectdia.cc +++ b/kcharselect/kcharselectdia.cc @@ -262,7 +262,7 @@ void KCharSelectDia::lineEditChanged() //================================================================== void KCharSelectDia::_exit() { - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("General"); config->writeEntry("selectedFont",vFont); diff --git a/kcharselect/main.cc b/kcharselect/main.cc index a64f379..0595370 100644 --- a/kcharselect/main.cc +++ b/kcharselect/main.cc @@ -31,7 +31,7 @@ int main(int argc, char **argv) TDEApplication app; - KConfig *config = kapp->config(); + TDEConfig *config = kapp->config(); config->setGroup("General"); TQString font(config->readEntry("selectedFont", TDEGlobalSettings::generalFont().family())); diff --git a/kdelirc/kcmlirc/kcmlirc.cpp b/kdelirc/kcmlirc/kcmlirc.cpp index 9df9c6e..c97b203 100644 --- a/kdelirc/kcmlirc/kcmlirc.cpp +++ b/kdelirc/kcmlirc/kcmlirc.cpp @@ -49,11 +49,11 @@ typedef KGenericFactory theFactory; K_EXPORT_COMPONENT_FACTORY(kcmlirc, theFactory("kcmlirc")) -KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DCOPObject("KCMLirc"), KCModule(parent, name) +KCMLirc::KCMLirc(TQWidget *parent, const char *name, TQStringList /*args*/) : DCOPObject("KCMLirc"), TDECModule(parent, name) { TDEGlobal::locale()->insertCatalogue( "kcmlirc" ); setAboutData(new TDEAboutData("kcmlirc", I18N_NOOP("TDE Lirc"), VERSION, I18N_NOOP("The TDE IR Remote Control System"), TDEAboutData::License_GPL_V2, "Copyright (c)2003 Gav Wood", I18N_NOOP("Use this to configure TDE's infrared remote control system in order to control any TDE application with your infrared remote control."), "http://www.kde.org")); - setButtons(KCModule::Help); + setButtons(TDECModule::Help); setQuickHelp(i18n("

Remote Controls

This module allows you to configure bindings between your remote controls and TDE applications. Simply select your remote control and click Add under the Actions/Buttons list. If you want TDE to attempt to automatically assign buttons to a supported application's actions, try clicking the Auto-Populate button.

To view the recognised applications and remote controls, simply select the Loaded Extensions tab.

")); bool ok; TDEApplication::kApplication()->dcopClient()->remoteInterfaces("irkick", "IRKick", &ok); @@ -534,7 +534,7 @@ void KCMLirc::configChanged() // TODO: Take this out when I know how extern "C" { - KDE_EXPORT KCModule *create_kcmlirc(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_kcmlirc(TQWidget *parent, const char *) { TDEGlobal::locale()->insertCatalogue("kcmlirc"); return new KCMLirc(parent, "KCMLirc"); } diff --git a/kdelirc/kcmlirc/kcmlirc.h b/kdelirc/kcmlirc/kcmlirc.h index a655b34..496908f 100644 --- a/kdelirc/kcmlirc/kcmlirc.h +++ b/kdelirc/kcmlirc/kcmlirc.h @@ -28,7 +28,7 @@ class TQDropEvent; class Profile; class Remote; -class KCMLirc: public KCModule, virtual public DCOPObject +class KCMLirc: public TDECModule, virtual public DCOPObject { Q_OBJECT // diff --git a/kdelirc/kdelirc/iraction.cpp b/kdelirc/kdelirc/iraction.cpp index ad558b5..7e2c26e 100644 --- a/kdelirc/kdelirc/iraction.cpp +++ b/kdelirc/kdelirc/iraction.cpp @@ -37,7 +37,7 @@ IRAction::IRAction(const TQString &newProgram, const TQString &newObject, const theIfMulti = newIfMulti; } -const IRAction &IRAction::loadFromConfig(KConfig &theConfig, int index) +const IRAction &IRAction::loadFromConfig(TDEConfig &theConfig, int index) { TQString Binding = "Binding" + TQString().setNum(index); int numArguments = theConfig.readNumEntry(Binding + "Arguments"); @@ -64,7 +64,7 @@ const IRAction &IRAction::loadFromConfig(KConfig &theConfig, int index) return *this; } -void IRAction::saveToConfig(KConfig &theConfig, int index) const +void IRAction::saveToConfig(TDEConfig &theConfig, int index) const { TQString Binding = "Binding" + TQString().setNum(index); diff --git a/kdelirc/kdelirc/iraction.h b/kdelirc/kdelirc/iraction.h index 7d70d6c..14d0354 100644 --- a/kdelirc/kdelirc/iraction.h +++ b/kdelirc/kdelirc/iraction.h @@ -23,7 +23,7 @@ @author Gav Wood */ -class KConfig; +class TDEConfig; class IRAction { @@ -36,8 +36,8 @@ class IRAction public: // load/save convenience functions - const IRAction &loadFromConfig(KConfig &theConfig, int index); - void saveToConfig(KConfig &theConfig, int index) const; + const IRAction &loadFromConfig(TDEConfig &theConfig, int index); + void saveToConfig(TDEConfig &theConfig, int index) const; // may be changed to a profile-based representation in the future. const TQString function() const; diff --git a/kdelirc/kdelirc/iractions.cpp b/kdelirc/kdelirc/iractions.cpp index e4ec0da..fa5d34f 100644 --- a/kdelirc/kdelirc/iractions.cpp +++ b/kdelirc/kdelirc/iractions.cpp @@ -16,7 +16,7 @@ #include "iractions.h" #include "iraction.h" -void IRActions::loadFromConfig(KConfig &theConfig) +void IRActions::loadFromConfig(TDEConfig &theConfig) { clear(); int numBindings = theConfig.readNumEntry("Bindings"); @@ -24,7 +24,7 @@ void IRActions::loadFromConfig(KConfig &theConfig) addAction(IRAction().loadFromConfig(theConfig, i)); } -void IRActions::purgeAllBindings(KConfig &theConfig) +void IRActions::purgeAllBindings(TDEConfig &theConfig) { int numBindings = theConfig.readNumEntry("Bindings"); for(int i = 0; i < numBindings; i++) @@ -41,7 +41,7 @@ void IRActions::purgeAllBindings(KConfig &theConfig) } } -void IRActions::saveToConfig(KConfig &theConfig) +void IRActions::saveToConfig(TDEConfig &theConfig) { int index = 0; purgeAllBindings(theConfig); diff --git a/kdelirc/kdelirc/iractions.h b/kdelirc/kdelirc/iractions.h index 8373669..4c44c46 100644 --- a/kdelirc/kdelirc/iractions.h +++ b/kdelirc/kdelirc/iractions.h @@ -25,7 +25,7 @@ @author Gav Wood */ -class KConfig; +class TDEConfig; typedef TQValueListIterator IRAIt; typedef TQValueList IRAItList; @@ -33,7 +33,7 @@ typedef TQValueList IRAItList; class IRActions: protected TQValueList { private: - void purgeAllBindings(KConfig &theConfig); + void purgeAllBindings(TDEConfig &theConfig); public: IRAIt addAction(const IRAction &theAction); @@ -44,8 +44,8 @@ public: void erase(const IRAIt &action) { TQValueList::erase(action); } void renameMode(const Mode &mode, const TQString &to); - void loadFromConfig(KConfig &theConfig); - void saveToConfig(KConfig &theConfig); + void loadFromConfig(TDEConfig &theConfig); + void saveToConfig(TDEConfig &theConfig); }; diff --git a/kdelirc/kdelirc/mode.cpp b/kdelirc/kdelirc/mode.cpp index cd0dc4c..3acae0a 100644 --- a/kdelirc/kdelirc/mode.cpp +++ b/kdelirc/kdelirc/mode.cpp @@ -31,7 +31,7 @@ Mode::~Mode() { } -const Mode &Mode::loadFromConfig(KConfig &theConfig, int index) +const Mode &Mode::loadFromConfig(TDEConfig &theConfig, int index) { TQString Prefix = "Mode" + TQString().setNum(index); theName = theConfig.readEntry(Prefix + "Name"); @@ -41,7 +41,7 @@ const Mode &Mode::loadFromConfig(KConfig &theConfig, int index) return *this; } -void Mode::saveToConfig(KConfig &theConfig, int index) +void Mode::saveToConfig(TDEConfig &theConfig, int index) { TQString Prefix = "Mode" + TQString().setNum(index); theConfig.writeEntry(Prefix + "Name", theName); diff --git a/kdelirc/kdelirc/mode.h b/kdelirc/kdelirc/mode.h index a2fa477..55b7b0a 100644 --- a/kdelirc/kdelirc/mode.h +++ b/kdelirc/kdelirc/mode.h @@ -21,7 +21,7 @@ @author Gav Wood */ -class KConfig; +class TDEConfig; class Mode { @@ -37,8 +37,8 @@ public: const TQString &iconFile() const { return theIconFile; } const TQString &remoteName() const { return RemoteServer::remoteServer()->getRemoteName(theRemote); } - const Mode &loadFromConfig(KConfig &theConfig, int index); - void saveToConfig(KConfig &theConfig, int index); + const Mode &loadFromConfig(TDEConfig &theConfig, int index); + void saveToConfig(TDEConfig &theConfig, int index); bool operator==(const Mode &mode) const { return mode.theName == theName && mode.theRemote == theRemote; } diff --git a/kdelirc/kdelirc/modes.cpp b/kdelirc/kdelirc/modes.cpp index 5346837..bbab16f 100644 --- a/kdelirc/kdelirc/modes.cpp +++ b/kdelirc/kdelirc/modes.cpp @@ -25,7 +25,7 @@ Modes::~Modes() { } -void Modes::loadFromConfig(KConfig &theConfig) +void Modes::loadFromConfig(TDEConfig &theConfig) { clear(); int numModes = theConfig.readNumEntry("Modes"); @@ -67,7 +67,7 @@ const Mode Modes::getDefault(const TQString &remote) const } -void Modes::purgeAllModes(KConfig &theConfig) +void Modes::purgeAllModes(TDEConfig &theConfig) { int numModes = theConfig.readNumEntry("Modes"); for(int i = 0; i < numModes; i++) @@ -77,7 +77,7 @@ void Modes::purgeAllModes(KConfig &theConfig) } } -void Modes::saveToConfig(KConfig &theConfig) +void Modes::saveToConfig(TDEConfig &theConfig) { int index = 0; purgeAllModes(theConfig); diff --git a/kdelirc/kdelirc/modes.h b/kdelirc/kdelirc/modes.h index ce89d43..d0de17a 100644 --- a/kdelirc/kdelirc/modes.h +++ b/kdelirc/kdelirc/modes.h @@ -24,18 +24,18 @@ @author Gav Wood */ -class KConfig; +class TDEConfig; typedef TQValueList ModeList; class Modes : protected TQMap > { - void purgeAllModes(KConfig &theConfig); + void purgeAllModes(TDEConfig &theConfig); TQMap theDefaults; public: - void loadFromConfig(KConfig &theConfig); - void saveToConfig(KConfig &theConfig); + void loadFromConfig(TDEConfig &theConfig); + void saveToConfig(TDEConfig &theConfig); void generateNulls(const TQStringList &theRemotes); const Mode &getMode(const TQString &remote, const TQString &mode) const; diff --git a/kdessh/kdessh.cpp b/kdessh/kdessh.cpp index 3d9d2b2..423a8f1 100644 --- a/kdessh/kdessh.cpp +++ b/kdessh/kdessh.cpp @@ -150,7 +150,7 @@ int main(int argc, char *argv[]) // Read configuration - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup(TQString::fromLatin1("Passwords")); int timeout = config->readNumEntry(TQString::fromLatin1("Timeout"), defTimeout); diff --git a/kdf/disklist.cpp b/kdf/disklist.cpp index 18a00c3..de0d213 100644 --- a/kdf/disklist.cpp +++ b/kdf/disklist.cpp @@ -81,7 +81,7 @@ void DiskList::setUpdatesDisabled(bool disable) } /*************************************************************************** - * saves the KConfig for special mount/umount scripts + * saves the TDEConfig for special mount/umount scripts **/ void DiskList::applySettings() { @@ -110,7 +110,7 @@ void DiskList::applySettings() /*************************************************************************** - * reads the KConfig for special mount/umount scripts + * reads the TDEConfig for special mount/umount scripts **/ void DiskList::loadSettings() { diff --git a/kdf/disklist.h b/kdf/disklist.h index 821af53..9dba750 100644 --- a/kdf/disklist.h +++ b/kdf/disklist.h @@ -129,7 +129,7 @@ private: TDEProcess *dfProc; TQString dfStringErrOut; bool readingDFStdErrOut; - KConfig *config; + TDEConfig *config; bool updatesDisabled; }; diff --git a/kdf/disks.h b/kdf/disks.h index 2b6329b..b39a9db 100644 --- a/kdf/disks.h +++ b/kdf/disks.h @@ -80,11 +80,11 @@ public: int kBSize() const { return size; } TQString iconName(); TQString realIconName() { return icoName; } - TQString prettyKBSize() const { return KIO::convertSizeFromKB(size); } + TQString prettyKBSize() const { return TDEIO::convertSizeFromKB(size); } int kBUsed() const { return used; } - TQString prettyKBUsed() const { return KIO::convertSizeFromKB(used); } + TQString prettyKBUsed() const { return TDEIO::convertSizeFromKB(used); } int kBAvail() const { return avail; } - TQString prettyKBAvail() const { return KIO::convertSizeFromKB(avail); } + TQString prettyKBAvail() const { return TDEIO::convertSizeFromKB(avail); } float percentFull() const; signals: diff --git a/kdf/kcmdf.cpp b/kdf/kcmdf.cpp index 2e26113..4daaaab 100644 --- a/kdf/kcmdf.cpp +++ b/kdf/kcmdf.cpp @@ -21,7 +21,7 @@ // // 1999-12-05 Espen Sand -// Modified to use KCModule instead of the old and obsolete +// Modified to use TDECModule instead of the old and obsolete // KControlApplication // @@ -33,7 +33,7 @@ #include "kcmdf.h" KDiskFreeWidget::KDiskFreeWidget( TQWidget *parent, const char *name ) - : KCModule( parent, name ) + : TDECModule( parent, name ) { setButtons(Help); @@ -57,7 +57,7 @@ TQString KDiskFreeWidget::quickHelp() const extern "C" { - KDE_EXPORT KCModule* create_kdf( TQWidget *parent, const char * /*name*/ ) + KDE_EXPORT TDECModule* create_kdf( TQWidget *parent, const char * /*name*/ ) { return new KDiskFreeWidget( parent , "kdf" ); } diff --git a/kdf/kcmdf.h b/kdf/kcmdf.h index f1a9a97..6bce3df 100644 --- a/kdf/kcmdf.h +++ b/kdf/kcmdf.h @@ -30,7 +30,7 @@ #include #include -class KDiskFreeWidget : public KCModule +class KDiskFreeWidget : public TDECModule { Q_OBJECT diff --git a/kdf/kconftest.cpp b/kdf/kconftest.cpp index 1e913ff..2c14a5c 100644 --- a/kdf/kconftest.cpp +++ b/kdf/kconftest.cpp @@ -50,7 +50,7 @@ main(int argc, char ** argv) TDECmdLineArgs::init(argc, argv, "test", description, version); TDEApplication app; - KConfig * cfg = kapp->config(); + TDEConfig * cfg = kapp->config(); TQDict dict; diff --git a/kdf/kdfconfig.cpp b/kdf/kdfconfig.cpp index b5ea4d0..302c4b8 100644 --- a/kdf/kdfconfig.cpp +++ b/kdf/kdfconfig.cpp @@ -162,7 +162,7 @@ void KDFConfigWidget::closeEvent(TQCloseEvent *) void KDFConfigWidget::applySettings( void ) { - KConfig &config = *kapp->config(); + TDEConfig &config = *kapp->config(); config.setGroup("KDFConfig"); if( GUI ) @@ -196,7 +196,7 @@ void KDFConfigWidget::applySettings( void ) void KDFConfigWidget::loadSettings( void ) { - KConfig &config = *kapp->config(); + TDEConfig &config = *kapp->config(); config.setGroup("KDFConfig"); if( GUI ) diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp index c6e05af..9b0d11a 100644 --- a/kdf/kdfwidget.cpp +++ b/kdf/kdfwidget.cpp @@ -198,11 +198,11 @@ void KDFWidget::settingsChanged( void ) /*************************************************************************** - * writes the KConfig + * writes the TDEConfig **/ void KDFWidget::applySettings( void ) { - KConfig &config = *kapp->config(); + TDEConfig &config = *kapp->config(); config.setGroup("KDiskFree"); if( GUI ) @@ -223,7 +223,7 @@ void KDFWidget::applySettings( void ) /*************************************************************************** - * reads the KConfig + * reads the TDEConfig **/ void KDFWidget::loadSettings( void ) { @@ -231,7 +231,7 @@ void KDFWidget::loadSettings( void ) if(GUI) { - KConfig &config = *kapp->config(); + TDEConfig &config = *kapp->config(); config.setGroup("KDiskFree"); for( uint i=0; iconfig(); + TDEConfig &config = *kapp->config(); config.setGroup("MntConfig"); if(GUI ) { @@ -192,7 +192,7 @@ void MntConfigWidget::applySettings( void ) void MntConfigWidget::loadSettings( void ) { - KConfig &config = *kapp->config(); + TDEConfig &config = *kapp->config(); if( mInitializing == false && GUI ) { config.setGroup("MntConfig"); diff --git a/kdf/stdoption.cpp b/kdf/stdoption.cpp index 04b75f5..9d7447e 100644 --- a/kdf/stdoption.cpp +++ b/kdf/stdoption.cpp @@ -47,7 +47,7 @@ CStdOption::~CStdOption( void ) void CStdOption::updateConfiguration( void ) { - KConfig &config = *kapp->config(); + TDEConfig &config = *kapp->config(); config.setGroup("KDFConfig"); mFileManager = config.readPathEntry( "FileManagerCommand", mDefaultFileManager ); @@ -62,7 +62,7 @@ void CStdOption::updateConfiguration( void ) void CStdOption::writeConfiguration( void ) { - KConfig &config = *kapp->config(); + TDEConfig &config = *kapp->config(); config.setGroup("KDFConfig"); config.writeEntry( "UpdateFrequency", mUpdateFrequency ); config.writePathEntry( "FileManagerCommand", mFileManager ); @@ -74,7 +74,7 @@ void CStdOption::writeConfiguration( void ) void CStdOption::writeDefaultFileManager( void ) { - KConfig &config = *kapp->config(); + TDEConfig &config = *kapp->config(); config.setGroup("KDFConfig"); config.writePathEntry( "FileManagerCommand", mDefaultFileManager ); config.sync(); diff --git a/kedit/kedit.cpp b/kedit/kedit.cpp index c4e5849..309dab9 100644 --- a/kedit/kedit.cpp +++ b/kedit/kedit.cpp @@ -248,7 +248,7 @@ void TopLevel::setupStatusBar() } -void TopLevel::saveProperties(KConfig* config) +void TopLevel::saveProperties(TDEConfig* config) { if(m_url.isEmpty() && !eframe->isModified()) return; @@ -273,7 +273,7 @@ void TopLevel::saveProperties(KConfig* config) } -void TopLevel::readProperties(KConfig* config){ +void TopLevel::readProperties(TDEConfig* config){ KURL url = config->readPathEntry("url"); TQString filename = config->readPathEntry("saved_to"); @@ -486,8 +486,8 @@ void TopLevel::file_open( void ) return; } - KIO::UDSEntry entry; - KIO::NetAccess::stat(url, entry, this); + TDEIO::UDSEntry entry; + TDEIO::NetAccess::stat(url, entry, this); KFileItem fileInfo(entry, url); if (fileInfo.size() > 2097152 && // 2MB large/small enough? KMessageBox::warningContinueCancel(this, @@ -515,10 +515,10 @@ void TopLevel::file_open( void ) } TQString tmpfile; - KIO::NetAccess::download( url, tmpfile, toplevel ); + TDEIO::NetAccess::download( url, tmpfile, toplevel ); int result = toplevel->openFile( tmpfile, 0, url.fileEncoding()); - KIO::NetAccess::removeTempFile( tmpfile ); + TDEIO::NetAccess::removeTempFile( tmpfile ); if( result == KEDIT_OK ) { @@ -557,9 +557,9 @@ void TopLevel::file_insert() } TQString tmpfile; - KIO::NetAccess::download( url, tmpfile, this ); + TDEIO::NetAccess::download( url, tmpfile, this ); int result = openFile( tmpfile, OPEN_INSERT, url.fileEncoding(), true ); - KIO::NetAccess::removeTempFile( tmpfile ); + TDEIO::NetAccess::removeTempFile( tmpfile ); if( result == KEDIT_OK ) { @@ -728,7 +728,7 @@ void TopLevel::file_save_as() if (u.isEmpty()) return; - if ( KIO::NetAccess::exists(u, false, this) ) + if ( TDEIO::NetAccess::exists(u, false, this) ) { int result = KMessageBox::warningContinueCancel( this, i18n( "A file named \"%1\" already exists. " @@ -827,11 +827,11 @@ void TopLevel::replace(){ void TopLevel::showSettings() { - if(KConfigDialog::showDialog("settings")) + if(TDEConfigDialog::showDialog("settings")) return; initSpellConfig(); - KConfigDialog* dialog = new SettingsDialog(this, "settings", Prefs::self(), kspellconfigOptions); + TDEConfigDialog* dialog = new SettingsDialog(this, "settings", Prefs::self(), kspellconfigOptions); connect(dialog, TQT_SIGNAL(settingsChanged()), this, TQT_SLOT(updateSettings())); dialog->show(); @@ -1007,7 +1007,7 @@ int TopLevel::saveURL( const KURL& _url ) eframe->setModified( true ); saveFile( tmpFile.name(), false, _url.fileEncoding() ); - if (KIO::NetAccess::upload( tmpFile.name(), _url, this ) == false) + if (TDEIO::NetAccess::upload( tmpFile.name(), _url, this ) == false) { KMessageBox::error(this, "Could not save remote file"); return KEDIT_RETRY; @@ -1133,7 +1133,7 @@ void TopLevel::openURL( const KURL& _url, int _mode ) TQString target; int result = KEDIT_OK; - if (KIO::NetAccess::download(_url, target, this)) + if (TDEIO::NetAccess::download(_url, target, this)) { result = openFile(target, _mode, _url.fileEncoding()); } @@ -1271,7 +1271,7 @@ extern "C" KDE_EXPORT int kdemain (int argc, char **argv) TDECmdLineArgs::addCmdLineOptions( options ); TDEApplication a; - //CT KIO::Job::initStatic(); + //CT TDEIO::Job::initStatic(); if ( a.isRestored() ) { int n = 1; @@ -1317,8 +1317,8 @@ extern "C" KDE_EXPORT int kdemain (int argc, char **argv) return a.exec (); } -SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleton *config, KSpellConfig *_spellConfig) - : KConfigDialog(parent, name, config), +SettingsDialog::SettingsDialog(TQWidget *parent, const char *name,TDEConfigSkeleton *config, KSpellConfig *_spellConfig) + : TDEConfigDialog(parent, name, config), spellConfig(_spellConfig), spellConfigChanged(false) { // Font diff --git a/kedit/kedit.h b/kedit/kedit.h index c353d87..56c4ccd 100644 --- a/kedit/kedit.h +++ b/kedit/kedit.h @@ -38,7 +38,7 @@ class TQTimer; class KAction; class KRecentFilesAction; -namespace KIO { class Job; } +namespace TDEIO { class Job; } // StatusBar field IDs #define ID_LINE_COLUMN 1 @@ -136,7 +136,7 @@ private: int open_mode; - KConfig *config; + TDEConfig *config; KSpell *kspell; // Current spell checking object @@ -149,8 +149,8 @@ private: TQPtrDict m_openMode; // Session management - void saveProperties(KConfig*); - void readProperties(KConfig*); + void saveProperties(TDEConfig*); + void readProperties(TDEConfig*); public slots: void openRecent(const KURL&); @@ -204,12 +204,12 @@ private slots: TQString replaceISpell(TQString msg, int client); }; -class SettingsDialog: public KConfigDialog { +class SettingsDialog: public TDEConfigDialog { Q_OBJECT public: - SettingsDialog(TQWidget *parent, const char *name,KConfigSkeleton *config, KSpellConfig *_spellConfig); + SettingsDialog(TQWidget *parent, const char *name,TDEConfigSkeleton *config, KSpellConfig *_spellConfig); protected slots: void updateSettings(); diff --git a/kfloppy/floppy.h b/kfloppy/floppy.h index 7a8e311..240181c 100644 --- a/kfloppy/floppy.h +++ b/kfloppy/floppy.h @@ -35,7 +35,7 @@ class TQButtonGroup; class TQGroupBox; class KProgress; -class KConfig; +class TDEConfig; class KPushButton; class KHelpMenu; class KFAction; @@ -87,7 +87,7 @@ private: TQString driveconfig; TQString densityconfig; TQString filesystemconfig; - KConfig *config; + TDEConfig *config; int drive; /// Number of blocks of the floppy (typically 1440) diff --git a/kfloppy/zip.cpp b/kfloppy/zip.cpp index 2f2b3be..b8457cf 100644 --- a/kfloppy/zip.cpp +++ b/kfloppy/zip.cpp @@ -99,7 +99,7 @@ FilesystemList ZipFormat::FSLabels() const enableSoftUpdates->setEnabled(b); } -/* virtual */ void ZipFormat::readSettings(KConfig *c) +/* virtual */ void ZipFormat::readSettings(TDEConfig *c) { c->setGroup(fslabel); zeroWholeDisk->setChecked( @@ -108,7 +108,7 @@ FilesystemList ZipFormat::FSLabels() const c->readBoolEntry("SoftUpdates",false)); } -/* virtual */ void ZipFormat::writeSettings(KConfig *c) +/* virtual */ void ZipFormat::writeSettings(TDEConfig *c) { c->setGroup(fslabel); c->writeEntry("ZeroDisk",zeroWholeDisk->isChecked()); diff --git a/kfloppy/zip.h b/kfloppy/zip.h index e9a66a3..cb02d18 100644 --- a/kfloppy/zip.h +++ b/kfloppy/zip.h @@ -42,7 +42,7 @@ class TQCheckBox; class TQTimer; class TDEProcess; -class KConfig; +class TDEConfig; class ZipFormat : public DiskFormat { @@ -60,8 +60,8 @@ public: virtual void setEnabled(bool); virtual void format(FilesystemData *); virtual void quit(); - virtual void readSettings(KConfig *); - virtual void writeSettings(KConfig *); + virtual void readSettings(TDEConfig *); + virtual void writeSettings(TDEConfig *); /** Check for dd and newfs, which we * need to do the formatting. diff --git a/kgpg/kgpg.cpp b/kgpg/kgpg.cpp index 6cfba30..34aa268 100644 --- a/kgpg/kgpg.cpp +++ b/kgpg/kgpg.cpp @@ -194,7 +194,7 @@ KURL encryptedFile(droppedUrls.first().path()+extension); TQFile encryptedFolder(droppedUrls.first().path()+extension); if (encryptedFolder.exists()) { dialogue->hide(); - KIO::RenameDlg *over=new KIO::RenameDlg(0,i18n("File Already Exists"),TQString(),encryptedFile.path(),KIO::M_OVERWRITE); + TDEIO::RenameDlg *over=new TDEIO::RenameDlg(0,i18n("File Already Exists"),TQString(),encryptedFile.path(),TDEIO::M_OVERWRITE); if (over->exec()==TQDialog::Rejected) { delete over; @@ -406,7 +406,7 @@ void MyView::decryptDroppedFile() swapname=KURL(droppedUrls.first().directory(0,0)+oldname); TQFile fgpg(swapname.path()); if (fgpg.exists()) { - KIO::RenameDlg *over=new KIO::RenameDlg(0,i18n("File Already Exists"),TQString(),swapname.path(),KIO::M_OVERWRITE); + TDEIO::RenameDlg *over=new TDEIO::RenameDlg(0,i18n("File Already Exists"),TQString(),swapname.path(),TDEIO::M_OVERWRITE); if (over->exec()==TQDialog::Rejected) { delete over; diff --git a/kgpg/kgpgeditor.cpp b/kgpg/kgpgeditor.cpp index 153cb75..7c69f4f 100644 --- a/kgpg/kgpgeditor.cpp +++ b/kgpg/kgpgeditor.cpp @@ -265,7 +265,7 @@ void KgpgApp::slotFilePreDec() if (!newname.isEmpty()) { TQFile fgpg(newname); if (fgpg.exists()) { - KIO::RenameDlg *over=new KIO::RenameDlg(0,i18n("File Already Exists"),TQString(),newname,KIO::M_OVERWRITE); + TDEIO::RenameDlg *over=new TDEIO::RenameDlg(0,i18n("File Already Exists"),TQString(),newname,TDEIO::M_OVERWRITE); if (over->exec()==TQDialog::Rejected) { delete over; @@ -348,7 +348,7 @@ void KgpgApp::slotFileSave() stream->setCodec(cod); *stream << view->editor->text();//.utf8(); tmpfile.close(); - if(!KIO::NetAccess::upload(tmpfile.name(), Docname,this)) { + if(!TDEIO::NetAccess::upload(tmpfile.name(), Docname,this)) { KMessageBox::sorry(this,i18n("The document could not be saved, please check your permissions and disk space.")); tmpfile.unlink(); return; @@ -383,7 +383,7 @@ void KgpgApp::slotFileSaveAs() } f.close(); } - else if (KIO::NetAccess::exists(url,false,this)) + else if (TDEIO::NetAccess::exists(url,false,this)) { TQString message=i18n("Overwrite existing file %1?").arg(url.fileName()); int result=KMessageBox::warningContinueCancel(this,TQString(message),i18n("Warning"),i18n("Overwrite")); @@ -400,7 +400,7 @@ void KgpgApp::openDocumentFile(const KURL& url,TQString encoding) { TQString tempOpenFile; ///////////////////////////////////////////////// -if( KIO::NetAccess::download( url, tempOpenFile,this ) ) { +if( TDEIO::NetAccess::download( url, tempOpenFile,this ) ) { TQFile qfile(tempOpenFile); if (qfile.open(IO_ReadOnly)) { TQTextStream t( &qfile ); diff --git a/kgpg/kgpginterface.cpp b/kgpg/kgpginterface.cpp index 0655b38..fae5911 100644 --- a/kgpg/kgpginterface.cpp +++ b/kgpg/kgpginterface.cpp @@ -958,7 +958,7 @@ void KgpgInterface::signover(TDEProcess *) void KgpgInterface::openSignConsole() { TDEProcess conprocess; - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("General"); conprocess<< config->readPathEntry("TerminalApplication","konsole"); conprocess<<"-e"<<"gpg"; @@ -1358,7 +1358,7 @@ void KgpgInterface::importKeyURL(KURL url) { ///////////// import a key - if( KIO::NetAccess::download( url, tempKeyFile,0) ) { + if( TDEIO::NetAccess::download( url, tempKeyFile,0) ) { message=TQString(); KProcIO *conprocess=new KProcIO(TQTextCodec::codecForLocale()); *conprocess<< "gpg"<<"--no-tty"<<"--no-secmem-warning"<<"--status-fd=2"<<"--utf8-strings"<<"--import"; @@ -1450,7 +1450,7 @@ kdDebug(2100)<<"Importing is over"<exec()==TQDialog::Rejected) { delete over; @@ -142,12 +142,12 @@ void KgpgLibrary::shredprocessenc(KURL::List filesToShred) { emit systemMessage(i18n("Shredding %n file","Shredding %n files",filesToShred.count())); -KIO::Job *job; -job = KIO::del( filesToShred, true ); -connect( job, TQT_SIGNAL( result( KIO::Job * ) ),TQT_SLOT( slotShredResult( KIO::Job * ) ) ); +TDEIO::Job *job; +job = TDEIO::del( filesToShred, true ); +connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),TQT_SLOT( slotShredResult( TDEIO::Job * ) ) ); } -void KgpgLibrary::slotShredResult( KIO::Job * job ) +void KgpgLibrary::slotShredResult( TDEIO::Job * job ) { emit systemMessage(TQString()); if (job && job->error()) diff --git a/kgpg/kgpglibrary.h b/kgpg/kgpglibrary.h index c887653..96f199e 100644 --- a/kgpg/kgpglibrary.h +++ b/kgpg/kgpglibrary.h @@ -51,7 +51,7 @@ private slots: void startencode(TQStringList encryptKeys,TQStringList encryptOptions,bool shred,bool symetric); void fastencode(KURL &fileToCrypt,TQStringList selec,TQStringList encryptOptions,bool symetric); // void startencode(TQString &selec,TQString encryptOptions,bool shred,bool symetric); - void slotShredResult( KIO::Job * job ); + void slotShredResult( TDEIO::Job * job ); void shredpreprocessenc(KURL fileToShred); void processenc(KURL); void processdecover(); diff --git a/kgpg/kgpgoptions.cpp b/kgpg/kgpgoptions.cpp index 85a0e75..825b413 100644 --- a/kgpg/kgpgoptions.cpp +++ b/kgpg/kgpgoptions.cpp @@ -63,12 +63,12 @@ class TQTabWidget; /////////////////////// main window kgpgOptions::kgpgOptions(TQWidget *parent, const char *name) - : KConfigDialog( parent, name, KGpgSettings::self()) + : TDEConfigDialog( parent, name, KGpgSettings::self()) { defaultServerList="hkp://wwwkeys.eu.pgp.net "; defaultServerList+=i18n("(Default)"); defaultServerList+=",hkp://search.keyserver.net,hkp://wwwkeys.pgp.net,hkp://pgp.dtype.org,hkp://wwwkeys.us.pgp.net"; - config = new KConfig ("kgpgrc"); + config = new TDEConfig ("kgpgrc"); config->setGroup("Servers"); serverList=TQStringList::split (",",config->readEntry("Server_List",defaultServerList)); keyServer = KgpgInterface::getGpgSetting("keyserver", KGpgSettings::gpgConfigPath()); diff --git a/kgpg/kgpgoptions.h b/kgpg/kgpgoptions.h index d58e9ba..7dcc8df 100644 --- a/kgpg/kgpgoptions.h +++ b/kgpg/kgpgoptions.h @@ -24,7 +24,7 @@ #define UnknownColor 2 #define RevColor 3 -class KConfig; +class TDEConfig; class Encryption; class Decryption; class UIConf; @@ -33,10 +33,10 @@ class ServerConf; class ColorsConf; class MiscConf; class KFontChooser; -class KConfig; +class TDEConfig; class KSimpleConfig; -class kgpgOptions : public KConfigDialog +class kgpgOptions : public TDEConfigDialog { Q_OBJECT @@ -53,7 +53,7 @@ public: KFontChooser *kfc; private: - KConfig *config; + TDEConfig *config; TQString alwaysKeyID,alwaysKeyName; bool firstDisplay; diff --git a/kgpg/kgpgsettings.kcfgc b/kgpg/kgpgsettings.kcfgc index afbe628..2eb79d7 100644 --- a/kgpg/kgpgsettings.kcfgc +++ b/kgpg/kgpgsettings.kcfgc @@ -3,7 +3,7 @@ File=kgpg.kcfg ClassName=KGpgSettings Singleton=true Mutators=true -# Inherits=KConfigSkeleton +# Inherits=TDEConfigSkeleton IncludeFiles=kgpginterface.h # MemberVariables=public CustomAdditions=true \ No newline at end of file diff --git a/kgpg/kgpgview.cpp b/kgpg/kgpgview.cpp index 2e6540c..3602156 100644 --- a/kgpg/kgpgview.cpp +++ b/kgpg/kgpgview.cpp @@ -87,7 +87,7 @@ void MyEditor::slotDroppedFile(KURL url) ///////////////// decide what to do with dropped file TQString text; if (!tempFile.isEmpty()) { - KIO::NetAccess::removeTempFile(tempFile); + TDEIO::NetAccess::removeTempFile(tempFile); tempFile=TQString(); } @@ -96,7 +96,7 @@ void MyEditor::slotDroppedFile(KURL url) else { if (KMessageBox::warningContinueCancel(0,i18n("Remote file dropped.
The remote file will now be copied to a temporary file to process requested operation. This temporary file will be deleted after operation."),0,KStdGuiItem::cont(),"RemoteFileWarning")!=KMessageBox::Continue) return; - if (!KIO::NetAccess::download (url, tempFile,this)) { + if (!TDEIO::NetAccess::download (url, tempFile,this)) { KMessageBox::sorry(this,i18n("Could not download file.")); return; } @@ -129,7 +129,7 @@ TQFile qfile(fileToCheck); qfile.close(); int result=KMessageBox::warningContinueCancel(this,i18n("

The file %1 is a public key.
Do you want to import it ?

").arg(fileToCheck),i18n("Warning")); if (result==KMessageBox::Cancel) { - KIO::NetAccess::removeTempFile(fileToCheck); + TDEIO::NetAccess::removeTempFile(fileToCheck); return true; } else { KgpgInterface *importKeyProcess=new KgpgInterface(); @@ -141,13 +141,13 @@ TQFile qfile(fileToCheck); if (result.startsWith("-----BEGIN PGP PRIVATE KEY BLOCK")) { qfile.close(); KMessageBox::information(0,i18n("This file is a private key.\nPlease use kgpg key management to import it.")); - KIO::NetAccess::removeTempFile(fileToCheck); + TDEIO::NetAccess::removeTempFile(fileToCheck); return true; } setText(result); qfile.close(); - KIO::NetAccess::removeTempFile(fileToCheck); + TDEIO::NetAccess::removeTempFile(fileToCheck); } } return false; @@ -183,7 +183,7 @@ void MyEditor::slotDecodeFile(TQString fname) void MyEditor::slotProcessResult(TQStringList iKeys) { emit refreshImported(iKeys); - KIO::NetAccess::removeTempFile(tempFile); + TDEIO::NetAccess::removeTempFile(tempFile); tempFile=TQString(); } diff --git a/kgpg/listkeys.cpp b/kgpg/listkeys.cpp index c761552..0e4a5ca 100644 --- a/kgpg/listkeys.cpp +++ b/kgpg/listkeys.cpp @@ -890,7 +890,7 @@ void listKeys::slotDelUid() item=item->parent(); TDEProcess *conprocess=new TDEProcess(); - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("General"); *conprocess<< config->readPathEntry("TerminalApplication","konsole"); *conprocess<<"-e"<<"gpg"; @@ -1283,7 +1283,7 @@ void listKeys::readOptions() void listKeys::showOptions() { - if (KConfigDialog::showDialog("settings")) + if (TDEConfigDialog::showDialog("settings")) return; kgpgOptions *optionsDialog=new kgpgOptions(this,"settings"); connect(optionsDialog,TQT_SIGNAL(settingsUpdated()),TQT_TQOBJECT(this),TQT_SLOT(readAllOptions())); @@ -1921,7 +1921,7 @@ void listKeys::signkey() else { TDEProcess kp; - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("General"); kp<< config->readPathEntry("TerminalApplication","konsole"); kp<<"-e" @@ -2097,7 +2097,7 @@ void listKeys::slotedit() TDEProcess kp; - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("General"); kp<< config->readPathEntry("TerminalApplication","konsole"); kp<<"-e" @@ -2216,7 +2216,7 @@ void listKeys::slotgenkey() { TDEProcess kp; - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("General"); kp<< config->readPathEntry("TerminalApplication","konsole"); kp<<"-e" @@ -2352,7 +2352,7 @@ void listKeys::deleteseckey() return; TDEProcess *conprocess=new TDEProcess(); - KConfig *config = TDEGlobal::config(); + TDEConfig *config = TDEGlobal::config(); config->setGroup("General"); *conprocess<< config->readPathEntry("TerminalApplication","konsole"); *conprocess<<"-e"<<"gpg" diff --git a/kgpg/popuppublic.h b/kgpg/popuppublic.h index e20c509..a732f4c 100644 --- a/kgpg/popuppublic.h +++ b/kgpg/popuppublic.h @@ -45,7 +45,7 @@ public: TQStringList untrustedList; private: - KConfig *config; + TDEConfig *config; TQButtonGroup *boutonboxoptions; TQString customOptions; diff --git a/khexedit/dialog.cc b/khexedit/dialog.cc index 1ce9636..6daed1a 100644 --- a/khexedit/dialog.cc +++ b/khexedit/dialog.cc @@ -78,7 +78,7 @@ CGotoDialog::CGotoDialog( TQWidget *parent, const char *name, bool modal ) gbox->addWidget( mCheckVisible, 2, 0 ); gbox->setRowStretch( 3, 10 ); - KConfig &config = *kapp->config(); + TDEConfig &config = *kapp->config(); config.setGroup("Goto Dialog"); mCheckFromCursor->setChecked( config.readBoolEntry( "FromCursor", false ) ); mCheckVisible->setChecked( config.readBoolEntry( "StayVisible", true ) ); @@ -89,7 +89,7 @@ CGotoDialog::CGotoDialog( TQWidget *parent, const char *name, bool modal ) CGotoDialog::~CGotoDialog( void ) { - KConfig &config = *kapp->config(); + TDEConfig &config = *kapp->config(); config.setGroup("Goto Dialog"); config.writeEntry( "FromCursor", mCheckFromCursor->isChecked() ); config.writeEntry( "StayVisible", mCheckVisible->isChecked() ); @@ -232,7 +232,7 @@ CFindDialog::CFindDialog( TQWidget *parent, const char *name, bool modal ) gbox->addWidget( mCheckIgnoreCase, 3, 0 ); gbox->setRowStretch( 4, 10 ); - KConfig &config = *kapp->config(); + TDEConfig &config = *kapp->config(); config.setGroup("Find Dialog"); mCheckFromCursor->setChecked( config.readBoolEntry( "FromCursor", true ) ); mCheckInSelection->setChecked( config.readBoolEntry( "InSelection", false) ); @@ -248,7 +248,7 @@ CFindDialog::CFindDialog( TQWidget *parent, const char *name, bool modal ) CFindDialog::~CFindDialog( void ) { - KConfig &config = *kapp->config(); + TDEConfig &config = *kapp->config(); config.setGroup("Find Dialog"); config.writeEntry( "FromCursor", mCheckFromCursor->isChecked() ); config.writeEntry( "InSelection", mCheckInSelection->isChecked() ); @@ -573,7 +573,7 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal ) gbox->addWidget( mCheckIgnoreCase, 3, 0 ); gbox->setRowStretch( 4, 10 ); - KConfig &config = *kapp->config(); + TDEConfig &config = *kapp->config(); config.setGroup("Replace Dialog"); mCheckFromCursor->setChecked( config.readBoolEntry( "FromCursor", true ) ); mCheckInSelection->setChecked( config.readBoolEntry( "InSelection", false) ); @@ -592,7 +592,7 @@ CReplaceDialog::CReplaceDialog( TQWidget *parent, const char *name, bool modal ) CReplaceDialog::~CReplaceDialog( void ) { - KConfig &config = *kapp->config(); + TDEConfig &config = *kapp->config(); config.setGroup("Replace Dialog"); config.writeEntry( "FromCursor", mCheckFromCursor->isChecked() ); config.writeEntry( "InSelection", mCheckInSelection->isChecked() ); @@ -1146,7 +1146,7 @@ CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal ) connect( mCheckOnCursor, TQT_SIGNAL(clicked()), TQT_SLOT(cursorCheck()) ); gbox->setRowStretch( 3, 10 ); - KConfig &config = *kapp->config(); + TDEConfig &config = *kapp->config(); config.setGroup("Insert Pattern Dialog"); mCheckPattern->setChecked( config.readBoolEntry( "RepeatPattern", false ) ); mCheckOnCursor->setChecked( config.readBoolEntry( "InsertOnCursor", false) ); @@ -1159,7 +1159,7 @@ CInsertDialog::CInsertDialog( TQWidget *parent, const char *name, bool modal ) CInsertDialog::~CInsertDialog( void ) { - KConfig &config = *kapp->config(); + TDEConfig &config = *kapp->config(); config.setGroup("Insert Pattern Dialog"); config.writeEntry( "RepeatPattern", mCheckPattern->isChecked() ); config.writeEntry( "InsertOnCursor", mCheckOnCursor->isChecked() ); diff --git a/khexedit/hexeditorwidget.cc b/khexedit/hexeditorwidget.cc index 5bf6c7f..0656e96 100644 --- a/khexedit/hexeditorwidget.cc +++ b/khexedit/hexeditorwidget.cc @@ -121,7 +121,7 @@ void CHexEditorWidget::initialize( void ) } -void CHexEditorWidget::writeConfiguration( KConfig &config ) +void CHexEditorWidget::writeConfiguration( TDEConfig &config ) { SDisplayLayout &layout = mDisplayState.layout; config.setGroup( "Display Options" ); @@ -219,7 +219,7 @@ void CHexEditorWidget::writeConfiguration( KConfig &config ) } } -void CHexEditorWidget::readConfiguration( KConfig &config ) +void CHexEditorWidget::readConfiguration( TDEConfig &config ) { SDisplayLayout &layout = mDisplayState.layout; config.setGroup( "Display Options" ); @@ -1987,12 +1987,12 @@ int CHexEditorWidget::readURL( const KURL &url, bool insert ) // 3) Load the file. // TQString tmpfile; - if ( !KIO::NetAccess::download( url, tmpfile, this ) ) + if ( !TDEIO::NetAccess::download( url, tmpfile, this ) ) return Err_ReadFailed; bool success = readFile( tmpfile, url.url(), insert ); - KIO::NetAccess::removeTempFile( tmpfile ); + TDEIO::NetAccess::removeTempFile( tmpfile ); return( success == true ? Err_Success : Err_ReadFailed ); } @@ -2009,7 +2009,7 @@ void CHexEditorWidget::writeURL( TQString &url ) KTempFile tf; tf.setAutoDelete( true ); writeFile( tf.name() ); - if( !KIO::NetAccess::upload(tf.name(),url,this) ) + if( !TDEIO::NetAccess::upload(tf.name(),url,this) ) { mHexView->setModified( modified ); TQString msg = i18n("Could not save remote file."); diff --git a/khexedit/hexeditorwidget.h b/khexedit/hexeditorwidget.h index a417343..0f63a89 100644 --- a/khexedit/hexeditorwidget.h +++ b/khexedit/hexeditorwidget.h @@ -48,7 +48,7 @@ class CExportDialog; class CConverterDialog; class CFindNavigatorDialog; class CReplacePromptDialog; -namespace KIO { class Job; } +namespace TDEIO { class Job; } class CHexEditorWidget : public TQWidget @@ -75,8 +75,8 @@ class CHexEditorWidget : public TQWidget ~CHexEditorWidget( void ); void initialize( void ); - void writeConfiguration( KConfig &config ); - void readConfiguration( KConfig &config ); + void writeConfiguration( TDEConfig &config ); + void readConfiguration( TDEConfig &config ); bool isOpen( const TQString &url, uint &offset ); bool modified( void ); diff --git a/khexedit/hextoolwidget.cc b/khexedit/hextoolwidget.cc index b5e918e..4fa957b 100644 --- a/khexedit/hextoolwidget.cc +++ b/khexedit/hextoolwidget.cc @@ -157,7 +157,7 @@ CHexToolWidget::~CHexToolWidget( void ) } -void CHexToolWidget::writeConfiguration( KConfig &config ) +void CHexToolWidget::writeConfiguration( TDEConfig &config ) { config.setGroup("Conversion" ); config.writeEntry("LittleEndian", mCheckIntelFormat->isChecked() ); @@ -165,7 +165,7 @@ void CHexToolWidget::writeConfiguration( KConfig &config ) config.writeEntry("StreamWindow", mBitCombo->currentItem() ); } -void CHexToolWidget::readConfiguration( KConfig &config ) +void CHexToolWidget::readConfiguration( TDEConfig &config ) { config.setGroup("Conversion" ); bool s1 = config.readBoolEntry( "LittleEndian", true ); diff --git a/khexedit/hextoolwidget.h b/khexedit/hextoolwidget.h index 94eb10c..fda0058 100644 --- a/khexedit/hextoolwidget.h +++ b/khexedit/hextoolwidget.h @@ -40,8 +40,8 @@ class CHexToolWidget : public TQFrame CHexToolWidget( TQWidget *parent = 0, const char *name = 0 ); ~CHexToolWidget( void ); - void writeConfiguration( KConfig &config ); - void readConfiguration( KConfig &config ); + void writeConfiguration( TDEConfig &config ); + void readConfiguration( TDEConfig &config ); unsigned long bitValue( SCursorState &state, int n ); protected: diff --git a/khexedit/stringdialog.cc b/khexedit/stringdialog.cc index 37247ae..a1367b4 100644 --- a/khexedit/stringdialog.cc +++ b/khexedit/stringdialog.cc @@ -150,7 +150,7 @@ void CStringDialog::showEvent( TQShowEvent *e ) void CStringDialog::readConfiguration( void ) { - KConfig &config = *kapp->config(); + TDEConfig &config = *kapp->config(); config.setGroup( "String Dialog" ); mLengthSpin->setValue( config.readNumEntry("MinimumLength", 4) ); @@ -163,7 +163,7 @@ void CStringDialog::readConfiguration( void ) void CStringDialog::writeConfiguration( void ) { - KConfig &config = *kapp->config(); + TDEConfig &config = *kapp->config(); config.setGroup( "String Dialog" ); config.writeEntry( "MinimumLength", mLengthSpin->value() ); diff --git a/khexedit/toplevel.cc b/khexedit/toplevel.cc index 2297c62..cd92779 100644 --- a/khexedit/toplevel.cc +++ b/khexedit/toplevel.cc @@ -378,7 +378,7 @@ void KHexEdit::initialize( bool openFiles ) { // Code modified from tdelibs/tdeui/kactionclasses.cpp KRecentFilesAction::loadEntries - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); const TQString oldGroup = config->group(); @@ -644,19 +644,19 @@ bool KHexEdit::queryExit( void ) void KHexEdit::readConfiguration( void ) { - KConfig &config = *kapp->config(); + TDEConfig &config = *kapp->config(); readConfiguration( config ); } void KHexEdit::writeConfiguration( void ) { - KConfig &config = *kapp->config(); + TDEConfig &config = *kapp->config(); writeConfiguration( config ); } -void KHexEdit::writeConfiguration( KConfig &config ) +void KHexEdit::writeConfiguration( TDEConfig &config ) { saveMainWindowSettings(& config, "General Options"); config.setGroup("General Options" ); @@ -676,7 +676,7 @@ void KHexEdit::writeConfiguration( KConfig &config ) } -void KHexEdit::readConfiguration( KConfig &config ) +void KHexEdit::readConfiguration( TDEConfig &config ) { applyMainWindowSettings(& config, "General Options"); diff --git a/khexedit/toplevel.h b/khexedit/toplevel.h index cb07e3c..8af4f0d 100644 --- a/khexedit/toplevel.h +++ b/khexedit/toplevel.h @@ -213,8 +213,8 @@ protected: void renameDocument( const TQString &curName, const TQString &newName ); void setTickedDocument( const TQString &fileName ); - void writeConfiguration( KConfig &config ); - void readConfiguration( KConfig &config ); + void writeConfiguration( TDEConfig &config ); + void readConfiguration( TDEConfig &config ); bool eventFilter( TQObject *obj, TQEvent *event ); int acceleratorNumKey( uint index ); diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp index f0a1c70..99c3ff9 100644 --- a/kjots/KJotsMain.cpp +++ b/kjots/KJotsMain.cpp @@ -388,10 +388,10 @@ void KJotsMain::deleteEntry() void KJotsMain::configure() { - if(KConfigDialog::showDialog("settings")) + if(TDEConfigDialog::showDialog("settings")) return; - KConfigDialog* dialog = new KConfigDialog(this, "settings", KJotsSettings::self()); + TDEConfigDialog* dialog = new TDEConfigDialog(this, "settings", KJotsSettings::self()); confPageFont* cpFont = new confPageFont(0, "Font"); dialog->addPage(cpFont, i18n("Font"), "fonts"); @@ -492,7 +492,7 @@ void KJotsMain::saveBookToFile(bool plainText) tryAgain = false; } - if (!KIO::NetAccess::exists(res.URLs[0], true, this) || + if (!TDEIO::NetAccess::exists(res.URLs[0], true, this) || KMessageBox::warningYesNo(this, "" + i18n("The file %1 already exists. Do you wish to overwrite it?").arg(res.URLs[0].prettyURL()) + "", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes) { tryAgain = false; @@ -533,7 +533,7 @@ void KJotsMain::savePageToFile(bool plainText) tryAgain = false; } - if (!KIO::NetAccess::exists(res.URLs[0], true, this) || + if (!TDEIO::NetAccess::exists(res.URLs[0], true, this) || KMessageBox::warningYesNo(this, "" + i18n("The file %1 already exists. Do you wish to overwrite it?").arg(res.URLs[0].prettyURL()) + "", i18n("File Exists"), i18n("Overwrite"), KStdGuiItem::cancel()) == KMessageBox::Yes) { tryAgain = false; diff --git a/kjots/KJotsSettings.kcfgc b/kjots/KJotsSettings.kcfgc index 486cddb..f6e99d5 100644 --- a/kjots/KJotsSettings.kcfgc +++ b/kjots/KJotsSettings.kcfgc @@ -3,6 +3,6 @@ File=kjots.kcfg ClassName=KJotsSettings Singleton=true Mutators=Width,Height,SplitterSizes,CurrentSelection,OpenBooks,LastId -# Inherits=KConfigSkeleton +# Inherits=TDEConfigSkeleton # IncludeFiles=libtdepim/kpimprefs.h # MemberVariables=public diff --git a/kjots/kjotsentry.cpp b/kjots/kjotsentry.cpp index a13fc2f..83b10e2 100644 --- a/kjots/kjotsentry.cpp +++ b/kjots/kjotsentry.cpp @@ -521,7 +521,7 @@ void KJotsBook::saveToFile(KURL url, bool plainText, const TQString& encoding) m_saveToPlainText = plainText; m_saveEncoding = TQTextCodec::codecForName(encoding.ascii()); - KIO::TransferJob* job = KIO::put(url, -1, true, false, false); + TDEIO::TransferJob* job = TDEIO::put(url, -1, true, false, false); if (!job) { @@ -541,8 +541,8 @@ void KJotsBook::saveToFile(KURL url, bool plainText, const TQString& encoding) m_saveProgressDialog->showCancelButton(false); m_saveProgressDialog->setAutoClose(true); - connect(job, TQT_SIGNAL(dataReq(KIO::Job*, TQByteArray&)), TQT_SLOT(saveDataReq(KIO::Job*, TQByteArray&))); - connect(job, TQT_SIGNAL(result( KIO::Job *)), TQT_SLOT(slotSaveResult( KIO::Job *))); + connect(job, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), TQT_SLOT(saveDataReq(TDEIO::Job*, TQByteArray&))); + connect(job, TQT_SIGNAL(result( TDEIO::Job *)), TQT_SLOT(slotSaveResult( TDEIO::Job *))); m_saveInProgress = true; } @@ -551,7 +551,7 @@ void KJotsBook::saveToFile(KURL url, bool plainText, const TQString& encoding) \brief Pumps out data when saving to a file. This function pumps out page data during a disk save. */ -void KJotsBook::saveDataReq(KIO::Job* /* job */, TQByteArray& data) +void KJotsBook::saveDataReq(TDEIO::Job* /* job */, TQByteArray& data) { if (!m_saveInProgress) return; //sanity check @@ -575,7 +575,7 @@ void KJotsBook::saveDataReq(KIO::Job* /* job */, TQByteArray& data) This function is called after a disk save. The disk save may or may not have completed normally. */ -void KJotsBook::slotSaveResult(KIO::Job *) +void KJotsBook::slotSaveResult(TDEIO::Job *) { m_saveInProgress = false; delete m_saveProgressDialog; @@ -933,14 +933,14 @@ void KJotsPage::saveToFile(KURL url, bool plainText, const TQString& encoding) m_saveToPlainText = plainText; m_saveEncoding = TQTextCodec::codecForName(encoding.ascii()); - KIO::TransferJob* job = KIO::put(url, -1, true, false, false); + TDEIO::TransferJob* job = TDEIO::put(url, -1, true, false, false); if (!job) { return; } - connect(job, TQT_SIGNAL(dataReq(KIO::Job*, TQByteArray&)), TQT_SLOT(saveDataReq(KIO::Job*, TQByteArray&))); - connect(job, TQT_SIGNAL(result( KIO::Job *)), TQT_SLOT(slotSaveResult( KIO::Job *))); + connect(job, TQT_SIGNAL(dataReq(TDEIO::Job*, TQByteArray&)), TQT_SLOT(saveDataReq(TDEIO::Job*, TQByteArray&))); + connect(job, TQT_SIGNAL(result( TDEIO::Job *)), TQT_SLOT(slotSaveResult( TDEIO::Job *))); m_saveInProgress = true; } @@ -950,7 +950,7 @@ void KJotsPage::saveToFile(KURL url, bool plainText, const TQString& encoding) \todo This should be augmented to cycle in case of REALLY long pages. */ -void KJotsPage::saveDataReq(KIO::Job* /* job */, TQByteArray& data) +void KJotsPage::saveDataReq(TDEIO::Job* /* job */, TQByteArray& data) { if (!m_saveInProgress) return; //sanity check @@ -974,7 +974,7 @@ void KJotsPage::saveDataReq(KIO::Job* /* job */, TQByteArray& data) This function is called after a disk save. The disk save may or may not have completed normally. */ -void KJotsPage::slotSaveResult(KIO::Job *) +void KJotsPage::slotSaveResult(TDEIO::Job *) { m_saveInProgress = false; /* if (job->error() != 0) {} */ diff --git a/kjots/kjotsentry.h b/kjots/kjotsentry.h index 96e5086..a0260c8 100644 --- a/kjots/kjotsentry.h +++ b/kjots/kjotsentry.h @@ -41,7 +41,7 @@ class TQFile; class KJotsBook; -namespace KIO +namespace TDEIO { class Job; } @@ -122,8 +122,8 @@ class KJotsBook : public KJotsEntryBase TQString generateText( void ); protected slots: - void saveDataReq(KIO::Job* job, TQByteArray& data); - void slotSaveResult(KIO::Job*); + void saveDataReq(TDEIO::Job* job, TQByteArray& data); + void slotSaveResult(TDEIO::Job*); private: TQString getToc(); @@ -166,8 +166,8 @@ class KJotsPage : public KJotsEntryBase TQString generateText( void ); protected slots: - void saveDataReq(KIO::Job* job, TQByteArray& data); - void slotSaveResult(KIO::Job*); + void saveDataReq(TDEIO::Job* job, TQByteArray& data); + void slotSaveResult(TDEIO::Job*); private: TQString m_text; diff --git a/kjots/main.cpp b/kjots/main.cpp index b8c6f22..d2a3e0a 100644 --- a/kjots/main.cpp +++ b/kjots/main.cpp @@ -62,7 +62,7 @@ int main( int argc, char **argv ) // backwards compatibility code to convert "old" user font settings // to the new config settings - KConfig *config = a.config(); + TDEConfig *config = a.config(); config->setGroup("kjots"); if (config->hasKey("EFontFamily")) { // read old font and create it diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp index e66513b..48b3788 100644 --- a/klaptopdaemon/acpi.cpp +++ b/klaptopdaemon/acpi.cpp @@ -52,11 +52,11 @@ extern void wake_laptop_daemon(); AcpiConfig::AcpiConfig (TQWidget * parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages - config = new KConfig("kcmlaptoprc"); + config = new TDEConfig("kcmlaptoprc"); TQVBoxLayout *top_layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/klaptopdaemon/acpi.h b/klaptopdaemon/acpi.h index d077af6..ac40433 100644 --- a/klaptopdaemon/acpi.h +++ b/klaptopdaemon/acpi.h @@ -30,14 +30,14 @@ class TQWidget; class TQSpinBox; -class KConfig; +class TDEConfig; class TQCheckBox; class KIconLoader; class KIconButton; class TQPushButton; -class AcpiConfig : public KCModule +class AcpiConfig : public TDECModule { Q_OBJECT @@ -58,7 +58,7 @@ private slots: void setupHelper(); private: - KConfig *config; + TDEConfig *config; TQCheckBox *enableHibernate; TQCheckBox *enableSuspend; diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp index 107cff0..80e61b4 100644 --- a/klaptopdaemon/apm.cpp +++ b/klaptopdaemon/apm.cpp @@ -52,11 +52,11 @@ extern void wake_laptop_daemon(); ApmConfig::ApmConfig (TQWidget * parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages - config = new KConfig("kcmlaptoprc"); + config = new TDEConfig("kcmlaptoprc"); TQVBoxLayout *top_layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/klaptopdaemon/apm.h b/klaptopdaemon/apm.h index 5a212f5..fe2585a 100644 --- a/klaptopdaemon/apm.h +++ b/klaptopdaemon/apm.h @@ -30,14 +30,14 @@ class TQWidget; class TQSpinBox; -class KConfig; +class TDEConfig; class TQCheckBox; class KIconLoader; class KIconButton; class TQPushButton; -class ApmConfig : public KCModule +class ApmConfig : public TDECModule { Q_OBJECT @@ -59,7 +59,7 @@ private slots: void setupHelper2(); private: - KConfig *config; + TDEConfig *config; TQCheckBox *enableSuspend; TQCheckBox *enableStandby; diff --git a/klaptopdaemon/battery.cpp b/klaptopdaemon/battery.cpp index e4ba202..4523b4c 100644 --- a/klaptopdaemon/battery.cpp +++ b/klaptopdaemon/battery.cpp @@ -52,7 +52,7 @@ extern void wake_laptop_daemon(); BatteryConfig::BatteryConfig (TQWidget * parent, const char *name) - : KCModule(parent, name), + : TDECModule(parent, name), editPoll(0), iconloader(0), buttonNoBattery(0), @@ -62,7 +62,7 @@ BatteryConfig::BatteryConfig (TQWidget * parent, const char *name) TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages apm = laptop_portable::has_power_management(); - config = new KConfig("kcmlaptoprc"); + config = new TDEConfig("kcmlaptoprc"); instance = new TDEInstance("klaptopdaemon"); TQVBoxLayout *top_layout = new TQVBoxLayout( this, KDialog::marginHint(), diff --git a/klaptopdaemon/battery.h b/klaptopdaemon/battery.h index 66fb555..a9ccc8d 100644 --- a/klaptopdaemon/battery.h +++ b/klaptopdaemon/battery.h @@ -34,7 +34,7 @@ class TQWidget; class TQSpinBox; -class KConfig; +class TDEConfig; class TQCheckBox; class KIconLoader; class KIconButton; @@ -42,7 +42,7 @@ class TQPushButton; class TQLabel; -class BatteryConfig : public KCModule +class BatteryConfig : public TDECModule { Q_OBJECT @@ -68,7 +68,7 @@ private slots: private: void timerEvent(TQTimerEvent *); void ConvertIcon(int percent, TQPixmap &pm, TQPixmap &result); - KConfig *config; + TDEConfig *config; TQSpinBox* editPoll; TQCheckBox* runMonitor; diff --git a/klaptopdaemon/buttons.cpp b/klaptopdaemon/buttons.cpp index eb3a6bf..2ab0396 100644 --- a/klaptopdaemon/buttons.cpp +++ b/klaptopdaemon/buttons.cpp @@ -45,7 +45,7 @@ extern void wake_laptop_daemon(); ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) - : KCModule(parent, name), + : TDECModule(parent, name), lidBox(0), lidStandby(0), lidSuspend(0), @@ -80,7 +80,7 @@ ButtonsConfig::ButtonsConfig (TQWidget * parent, const char *name) TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages apm = laptop_portable::has_power_management(); - config = new KConfig("kcmlaptoprc"); + config = new TDEConfig("kcmlaptoprc"); int can_brightness = laptop_portable::has_brightness(); TQStringList throttle_list; int current_throttle; diff --git a/klaptopdaemon/buttons.h b/klaptopdaemon/buttons.h index b18c041..8a4be63 100644 --- a/klaptopdaemon/buttons.h +++ b/klaptopdaemon/buttons.h @@ -33,11 +33,11 @@ class TQSlider; class TQButtonGroup; class TQRadioButton; class TQSpinBox; -class KConfig; +class TDEConfig; class TQCheckBox; class KComboBox; -class ButtonsConfig : public KCModule +class ButtonsConfig : public TDECModule { Q_OBJECT @@ -85,7 +85,7 @@ private: bool lid_performance_enabled, power_performance_enabled; TQString lid_performance_val, power_performance_val; - KConfig *config; + TDEConfig *config; int power, lid, apm; }; diff --git a/klaptopdaemon/daemon_state.cpp b/klaptopdaemon/daemon_state.cpp index 49d4ade..6d1fe7d 100644 --- a/klaptopdaemon/daemon_state.cpp +++ b/klaptopdaemon/daemon_state.cpp @@ -68,7 +68,7 @@ daemon_state::~daemon_state() void daemon_state::load() { - KConfig *config = new KConfig("kcmlaptoprc"); + TDEConfig *config = new TDEConfig("kcmlaptoprc"); if (config == 0) { ::fprintf(stderr, "laptop_daemon: can't open kcmlaptop config files\n"); diff --git a/klaptopdaemon/daemondock.cpp b/klaptopdaemon/daemondock.cpp index 88b89e6..7c03af8 100644 --- a/klaptopdaemon/daemondock.cpp +++ b/klaptopdaemon/daemondock.cpp @@ -274,7 +274,7 @@ void laptop_dock::slotHide() { return; // just tell ourselves to hide the battery - KConfig *config = new KConfig("kcmlaptoprc"); + TDEConfig *config = new TDEConfig("kcmlaptoprc"); if (config) { config->setGroup("BatteryDefault"); config->writeEntry("Enable", false); @@ -295,7 +295,7 @@ void laptop_dock::slotQuit() { if (confirm == KMessageBox::Yes) { // just tell ourselves to hide the battery - KConfig *config = new KConfig("kcmlaptoprc"); + TDEConfig *config = new TDEConfig("kcmlaptoprc"); if (config) { config->setGroup("BatteryDefault"); config->writeEntry("Enable", false); @@ -673,7 +673,7 @@ quit: // prepare icon for systemtray - KConfig* config = new KConfig("kcmlaptoprc"); + TDEConfig* config = new TDEConfig("kcmlaptoprc"); bool showlevel = false; if (config) diff --git a/klaptopdaemon/laptop_daemon.cpp b/klaptopdaemon/laptop_daemon.cpp index 6868545..8e9c042 100644 --- a/klaptopdaemon/laptop_daemon.cpp +++ b/klaptopdaemon/laptop_daemon.cpp @@ -729,7 +729,7 @@ void laptop_daemon::displayPixmap() { if (s.have_time == 2 && s.exists && !powered) { // in some circumstances s.have_time = (val < 0 ? 0 : 1); // the battery is not charging - KConfig *config = new KConfig("kcmlaptoprc"); + TDEConfig *config = new TDEConfig("kcmlaptoprc"); if (config) { config->setGroup("BatteryLow"); // we can;t figure this out 'till config->writeEntry("HaveTime", s.have_time); diff --git a/klaptopdaemon/main.cpp b/klaptopdaemon/main.cpp index 9d0f648..1687437 100644 --- a/klaptopdaemon/main.cpp +++ b/klaptopdaemon/main.cpp @@ -48,51 +48,51 @@ extern void wake_laptop_daemon(); extern "C" { - KDE_EXPORT KCModule *create_pcmcia(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_pcmcia(TQWidget *parent, const char *) { return new PcmciaConfig(parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_bwarning(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_bwarning(TQWidget *parent, const char *) { return new WarningConfig(0, parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_cwarning(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_cwarning(TQWidget *parent, const char *) { return new WarningConfig(1, parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_battery(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_battery(TQWidget *parent, const char *) { return new BatteryConfig(parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_power(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_power(TQWidget *parent, const char *) { return new PowerConfig(parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_acpi(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_acpi(TQWidget *parent, const char *) { return new AcpiConfig(parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_apm(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_apm(TQWidget *parent, const char *) { return new ApmConfig(parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_Profile(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_Profile(TQWidget *parent, const char *) { return new ProfileConfig(parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_sony(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_sony(TQWidget *parent, const char *) { return new SonyConfig(parent, "kcmlaptop"); } - KDE_EXPORT KCModule *create_buttons(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_buttons(TQWidget *parent, const char *) { return new ButtonsConfig(parent, "kcmlaptop"); } KDE_EXPORT void init_battery() { - KConfig config("kcmlaptoprc", true /*readonly*/, false /*no globals*/); + TDEConfig config("kcmlaptoprc", true /*readonly*/, false /*no globals*/); config.setGroup("BatteryDefault"); bool enable = false; if (!config.hasKey("Enable")) { // if they have APM or PCMCIA, Enable=true @@ -111,7 +111,7 @@ extern "C" wake_laptop_daemon(); } - KDE_EXPORT KCModule *create_laptop(TQWidget *parent, const char *) + KDE_EXPORT TDECModule *create_laptop(TQWidget *parent, const char *) { return new LaptopModule(parent, "kcmlaptop"); } @@ -125,10 +125,10 @@ extern "C" LaptopModule::LaptopModule(TQWidget *parent, const char *) - : KCModule(parent, "kcmlaptop") + : TDECModule(parent, "kcmlaptop") { { // export ACPI options - KConfig config("kcmlaptoprc", true /*readonly*/, false /*no globals*/); + TDEConfig config("kcmlaptoprc", true /*readonly*/, false /*no globals*/); config.setGroup("AcpiDefault"); bool enablestandby = config.readBoolEntry("EnableStandby", false); diff --git a/klaptopdaemon/main.h b/klaptopdaemon/main.h index 448d3c6..7dc725e 100644 --- a/klaptopdaemon/main.h +++ b/klaptopdaemon/main.h @@ -41,7 +41,7 @@ class SonyConfig; class ProfileConfig; class ButtonsConfig; -class LaptopModule : public KCModule +class LaptopModule : public TDECModule { Q_OBJECT diff --git a/klaptopdaemon/pcmcia.cpp b/klaptopdaemon/pcmcia.cpp index 4554686..88ee06d 100644 --- a/klaptopdaemon/pcmcia.cpp +++ b/klaptopdaemon/pcmcia.cpp @@ -38,7 +38,7 @@ #include "version.h" PcmciaConfig::PcmciaConfig (TQWidget * parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmlaptop"), @@ -109,7 +109,7 @@ void PcmciaConfig::defaults() void PcmciaConfig::changed() { - emit KCModule::changed(true); + emit TDECModule::changed(true); } diff --git a/klaptopdaemon/pcmcia.h b/klaptopdaemon/pcmcia.h index 9d4949c..66f0434 100644 --- a/klaptopdaemon/pcmcia.h +++ b/klaptopdaemon/pcmcia.h @@ -38,7 +38,7 @@ #include #include -class PcmciaConfig : public KCModule +class PcmciaConfig : public TDECModule { Q_OBJECT diff --git a/klaptopdaemon/portable.cpp b/klaptopdaemon/portable.cpp index ed4801f..d1af1a5 100644 --- a/klaptopdaemon/portable.cpp +++ b/klaptopdaemon/portable.cpp @@ -354,7 +354,7 @@ static void acpi_read_batteries() { delete f; } if (bat.cap <= 0) { - KConfig* config = new KConfig("kcmlaptoprc", true /*readonly*/, false /*useKDEGlobals*/); + TDEConfig* config = new TDEConfig("kcmlaptoprc", true /*readonly*/, false /*useKDEGlobals*/); config->setGroup("AcpiBattery"); bat.cap = config->readNumEntry(bat.name,0); delete config; @@ -393,7 +393,7 @@ static void acpi_read_batteries() { if (bat.present) { if (bat.remaining > bat.cap) { // happens e.g. if the system doesn't provide a capacity value bat.cap = bat.remaining; - KConfig* config = new KConfig("kcmlaptoprc", false /*readonly*/, false /*useKDEGlobals*/); + TDEConfig* config = new TDEConfig("kcmlaptoprc", false /*readonly*/, false /*useKDEGlobals*/); config->setGroup("AcpiBattery"); config->writeEntry(bat.name, bat.cap); config->sync(); @@ -1162,7 +1162,7 @@ void laptop_portable::invoke_hibernation() } void -laptop_portable::extra_config(TQWidget *wp, KConfig *, TQVBoxLayout *top_layout) +laptop_portable::extra_config(TQWidget *wp, TDEConfig *, TQVBoxLayout *top_layout) { if (laptop_portable::has_apm(1) || laptop_portable::has_acpi(1)) return; @@ -2267,7 +2267,7 @@ laptop_portable::apm_set_mask(bool , bool ) // adds extra widgets to the battery panel // void -laptop_portable::extra_config(TQWidget * /*parent*/, KConfig * /*config*/, TQVBoxLayout * /*layout*/) +laptop_portable::extra_config(TQWidget * /*parent*/, TDEConfig * /*config*/, TQVBoxLayout * /*layout*/) { // INSERT HERE } @@ -2945,7 +2945,7 @@ int laptop_portable::has_apm(int) // adds extra widgets to the battery panel // void -laptop_portable::extra_config(TQWidget *parent, KConfig *config, TQVBoxLayout *layout) +laptop_portable::extra_config(TQWidget *parent, TDEConfig *config, TQVBoxLayout *layout) { // INSERT HERE } diff --git a/klaptopdaemon/portable.h b/klaptopdaemon/portable.h index a9fa703..d2d2ef3 100644 --- a/klaptopdaemon/portable.h +++ b/klaptopdaemon/portable.h @@ -98,7 +98,7 @@ public: static void get_battery_status(int &num_batteries, TQStringList &names, TQStringList &state, TQStringList &values); // get multiple battery status static bool has_lav(); // true if the following returns a valid value static float get_load_average(); // current short term load average - static void extra_config(TQWidget *parent, KConfig *config, TQVBoxLayout *layout); + static void extra_config(TQWidget *parent, TDEConfig *config, TQVBoxLayout *layout); static void acpi_set_mask(bool standby, bool suspend, bool hibernate, bool perf, bool throttle); static void apm_set_mask(bool standby, bool suspend); static void software_suspend_set_mask(bool hibernate); diff --git a/klaptopdaemon/power.cpp b/klaptopdaemon/power.cpp index 28e558e..b7e387a 100644 --- a/klaptopdaemon/power.cpp +++ b/klaptopdaemon/power.cpp @@ -46,7 +46,7 @@ extern void wake_laptop_daemon(); PowerConfig::PowerConfig (TQWidget * parent, const char *name) - : KCModule(parent, name), + : TDECModule(parent, name), nopowerBox(0), nopowerStandby(0), nopowerSuspend(0), @@ -82,7 +82,7 @@ PowerConfig::PowerConfig (TQWidget * parent, const char *name) TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages apm = laptop_portable::has_power_management(); - config = new KConfig("kcmlaptoprc"); + config = new TDEConfig("kcmlaptoprc"); int can_brightness = laptop_portable::has_brightness(); TQStringList throttle_list; int current_throttle; diff --git a/klaptopdaemon/power.h b/klaptopdaemon/power.h index aa140b4..43917e6 100644 --- a/klaptopdaemon/power.h +++ b/klaptopdaemon/power.h @@ -33,12 +33,12 @@ class TQSlider; class TQButtonGroup; class TQRadioButton; class TQSpinBox; -class KConfig; +class TDEConfig; class TQCheckBox; class KComboBox; class KDoubleSpinBox; -class PowerConfig : public KCModule +class PowerConfig : public TDECModule { Q_OBJECT @@ -91,7 +91,7 @@ private: float edit_lav, noedit_lav; TQString nopower_performance_val, power_performance_val; - KConfig *config; + TDEConfig *config; int power, nopower, apm; }; diff --git a/klaptopdaemon/profile.cpp b/klaptopdaemon/profile.cpp index c61e884..f60630b 100644 --- a/klaptopdaemon/profile.cpp +++ b/klaptopdaemon/profile.cpp @@ -54,7 +54,7 @@ extern void wake_laptop_daemon(); ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { TQStringList performance_list; int current_performance; @@ -66,7 +66,7 @@ ProfileConfig::ProfileConfig(TQWidget * parent, const char *name) TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages - config = new KConfig("kcmlaptoprc"); + config = new TDEConfig("kcmlaptoprc"); TQVBoxLayout *top_layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/klaptopdaemon/profile.h b/klaptopdaemon/profile.h index 4eb0851..e3090ce 100644 --- a/klaptopdaemon/profile.h +++ b/klaptopdaemon/profile.h @@ -30,7 +30,7 @@ class TQWidget; class TQSpinBox; -class KConfig; +class TDEConfig; class TQCheckBox; class TQSlider; class KIconLoader; @@ -39,7 +39,7 @@ class TQPushButton; class KComboBox; -class ProfileConfig : public KCModule +class ProfileConfig : public TDECModule { Q_OBJECT @@ -67,7 +67,7 @@ private slots: private: - KConfig *config; + TDEConfig *config; TQCheckBox *pon, *performance_on, *throttle_on; TQSlider *son; diff --git a/klaptopdaemon/sony.cpp b/klaptopdaemon/sony.cpp index a318153..ad2bda2 100644 --- a/klaptopdaemon/sony.cpp +++ b/klaptopdaemon/sony.cpp @@ -56,11 +56,11 @@ extern void wake_laptop_daemon(); SonyConfig::SonyConfig(TQWidget * parent, const char *name) - : KCModule(parent, name) + : TDECModule(parent, name) { TDEGlobal::locale()->insertCatalogue("klaptopdaemon"); // For translation of klaptopdaemon messages - config = new KConfig("kcmlaptoprc"); + config = new TDEConfig("kcmlaptoprc"); TQVBoxLayout *top_layout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/klaptopdaemon/sony.h b/klaptopdaemon/sony.h index 52de84d..cb354a3 100644 --- a/klaptopdaemon/sony.h +++ b/klaptopdaemon/sony.h @@ -30,7 +30,7 @@ class TQWidget; class TQSpinBox; -class KConfig; +class TDEConfig; class TQCheckBox; class TQSlider; class KIconLoader; @@ -38,7 +38,7 @@ class KIconButton; class TQPushButton; -class SonyConfig : public KCModule +class SonyConfig : public TDECModule { Q_OBJECT @@ -60,7 +60,7 @@ private slots: void setupHelper(); private: - KConfig *config; + TDEConfig *config; TQCheckBox *enableScrollBar; bool enablescrollbar; diff --git a/klaptopdaemon/warning.cpp b/klaptopdaemon/warning.cpp index 14fb14b..f7f3b85 100644 --- a/klaptopdaemon/warning.cpp +++ b/klaptopdaemon/warning.cpp @@ -45,7 +45,7 @@ extern void wake_laptop_daemon(); WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) - : KCModule(parent, name), + : TDECModule(parent, name), checkSuspend(0), checkStandby(0), checkHibernate(0) @@ -54,7 +54,7 @@ WarningConfig::WarningConfig (int t, TQWidget * parent, const char *name) type = t; apm = laptop_portable::has_power_management(); - config = new KConfig("kcmlaptoprc"); + config = new TDEConfig("kcmlaptoprc"); my_load(0); diff --git a/klaptopdaemon/warning.h b/klaptopdaemon/warning.h index 67244ca..c7f4f9d 100644 --- a/klaptopdaemon/warning.h +++ b/klaptopdaemon/warning.h @@ -30,7 +30,7 @@ #include class TQWidget; -class KConfig; +class TDEConfig; class KURLRequester; class TQCheckBox; class TQRadioButton; @@ -38,7 +38,7 @@ class TQSpinBox; class TQSlider; class KComboBox; -class WarningConfig : public KCModule +class WarningConfig : public TDECModule { Q_OBJECT @@ -65,7 +65,7 @@ private slots: private: void my_load(int x, bool useDefaults=false ); - KConfig *config; + TDEConfig *config; KURLRequester* editRunCommand; KURLRequester* editPlaySound; diff --git a/kmilo/generic/generic_monitor.cpp b/kmilo/generic/generic_monitor.cpp index 658533a..bbc5f84 100644 --- a/kmilo/generic/generic_monitor.cpp +++ b/kmilo/generic/generic_monitor.cpp @@ -69,10 +69,10 @@ GenericMonitor::~GenericMonitor() bool GenericMonitor::init() { - KConfig config(CONFIG_FILE); + TDEConfig config(CONFIG_FILE); reconfigure(&config); - //config = new KConfig("kmilodrc"); + //config = new TDEConfig("kmilodrc"); config.setGroup("kubuntu"); if(!m_enabled) @@ -120,7 +120,7 @@ bool GenericMonitor::init() return true; } -void GenericMonitor::reconfigure(KConfig *config) +void GenericMonitor::reconfigure(TDEConfig *config) { config->setGroup("generic monitor"); diff --git a/kmilo/generic/generic_monitor.h b/kmilo/generic/generic_monitor.h index 3884627..18fd4eb 100644 --- a/kmilo/generic/generic_monitor.h +++ b/kmilo/generic/generic_monitor.h @@ -57,7 +57,7 @@ public: virtual bool init(); virtual int progress() const; virtual DisplayType poll(); - virtual void reconfigure(KConfig*); + virtual void reconfigure(TDEConfig*); public slots: void slowVolumeUp(); @@ -86,7 +86,7 @@ private: void launch(TQString configKey, TQString defaultApplication); TDEGlobalAccel *ga; - KConfig* config; + TDEConfig* config; DCOPRef *kmixClient, *kmixWindow; diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp index d684d44..ce01438 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/main.cpp +++ b/kmilo/kmilo_kvaio/kcmkvaio/main.cpp @@ -47,7 +47,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kvaio, KVaioModuleFactory("kcmkvaio")) KVaioModule::KVaioModule(TQWidget *parent, const char *name, const TQStringList &) - : KCModule(KVaioModuleFactory::instance(), parent, name) + : TDECModule(KVaioModuleFactory::instance(), parent, name) { TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmkvaio"), @@ -94,7 +94,7 @@ void KVaioModule::save() DCOPClient mClient; kdDebug() << "KVaioModule: saving." << endl; - KConfig config(CONFIG_FILE); + TDEConfig config(CONFIG_FILE); config.setGroup("KVaio"); @@ -131,7 +131,7 @@ void KVaioModule::load() void KVaioModule::load(bool useDefaults) { kdDebug() << "KVaioModule: loading." << endl; - KConfig config(CONFIG_FILE); + TDEConfig config(CONFIG_FILE); config.setReadDefaults( useDefaults ); diff --git a/kmilo/kmilo_kvaio/kcmkvaio/main.h b/kmilo/kmilo_kvaio/kcmkvaio/main.h index 11e2d31..d40d07d 100644 --- a/kmilo/kmilo_kvaio/kcmkvaio/main.h +++ b/kmilo/kmilo_kvaio/kcmkvaio/main.h @@ -28,7 +28,7 @@ class TQTimer; class KCMKVaioGeneral; -class KVaioModule : public KCModule +class KVaioModule : public TDECModule { Q_OBJECT diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.cpp b/kmilo/kmilo_kvaio/kmilo_kvaio.cpp index 7ecf253..87de2da 100644 --- a/kmilo/kmilo_kvaio/kmilo_kvaio.cpp +++ b/kmilo/kmilo_kvaio/kmilo_kvaio.cpp @@ -59,7 +59,7 @@ int KMiloKVaio::progress() const { return m_kvaio->progress(); } -void KMiloKVaio::reconfigure(KConfig* k) +void KMiloKVaio::reconfigure(TDEConfig* k) { m_kvaio->loadConfiguration(k); } diff --git a/kmilo/kmilo_kvaio/kmilo_kvaio.h b/kmilo/kmilo_kvaio/kmilo_kvaio.h index 6fb2ce5..7104845 100644 --- a/kmilo/kmilo_kvaio/kmilo_kvaio.h +++ b/kmilo/kmilo_kvaio/kmilo_kvaio.h @@ -46,7 +46,7 @@ class KMiloKVaio : public KMilo::Monitor { virtual DisplayType poll(); virtual int progress() const; - virtual void reconfigure(KConfig*); + virtual void reconfigure(TDEConfig*); bool showTextMsg(const TQString& msg) { diff --git a/kmilo/kmilo_kvaio/kvaio.cpp b/kmilo/kmilo_kvaio/kvaio.cpp index 437d188..e8011e7 100644 --- a/kmilo/kmilo_kvaio/kvaio.cpp +++ b/kmilo/kmilo_kvaio/kvaio.cpp @@ -87,7 +87,7 @@ KVaio::KVaio(KMiloKVaio *parent, const char* name) kdDebug() << "KVaio ctor: cannot attach to DCOP server." << endl; } - KConfig config("kmilodrc"); + TDEConfig config("kmilodrc"); loadConfiguration(&config); @@ -300,7 +300,7 @@ bool KVaio::isKMiloDAvailable() } } -void KVaio::loadConfiguration(KConfig *k) +void KVaio::loadConfiguration(TDEConfig *k) { k->setGroup("KVaio"); diff --git a/kmilo/kmilo_kvaio/kvaio.h b/kmilo/kmilo_kvaio/kvaio.h index bf5ad22..cafea4c 100644 --- a/kmilo/kmilo_kvaio/kvaio.h +++ b/kmilo/kmilo_kvaio/kvaio.h @@ -63,7 +63,7 @@ public: virtual ~KVaio(); const KVaioDriverInterface *driver(); - void loadConfiguration(KConfig *); + void loadConfiguration(TDEConfig *); const int progress() { return m_progress; } protected: diff --git a/kmilo/kmilod/defaultskin.cpp b/kmilo/kmilod/defaultskin.cpp index 2793ee2..b9595e2 100644 --- a/kmilo/kmilod/defaultskin.cpp +++ b/kmilo/kmilod/defaultskin.cpp @@ -51,7 +51,7 @@ DefaultSkin::DefaultSkin() { _widget->hide(); - KConfig config("kmilodrc"); + TDEConfig config("kmilodrc"); reconfigure( &config ); } @@ -61,7 +61,7 @@ DefaultSkin::~DefaultSkin() { _widget = 0; } -void DefaultSkin::reconfigure( KConfig *config ) { +void DefaultSkin::reconfigure( TDEConfig *config ) { config->setGroup("DefaultSkin"); diff --git a/kmilo/kmilod/defaultskin.h b/kmilo/kmilod/defaultskin.h index 69e2e3f..2399d83 100644 --- a/kmilo/kmilod/defaultskin.h +++ b/kmilo/kmilod/defaultskin.h @@ -38,7 +38,7 @@ class DefaultSkin : public TQObject, public KMilo::DisplaySkin { virtual ~DefaultSkin(); virtual void clear(); - virtual void reconfigure( KConfig *config ); + virtual void reconfigure( TDEConfig *config ); virtual void displayText(const TQString& text, const TQPixmap& customPixmap=TQPixmap()); virtual void displayProgress(const TQString& text, diff --git a/kmilo/kmilod/kmilod.cpp b/kmilo/kmilod/kmilod.cpp index aa40b6d..1b777e2 100644 --- a/kmilo/kmilod/kmilod.cpp +++ b/kmilo/kmilod/kmilod.cpp @@ -213,7 +213,7 @@ void KMiloD::displayProgress(const TQString& text, int progress, const TQPixmap& void KMiloD::reconfigure() { // load the kmilo configuration file: - KConfig config("kmilodrc"); + TDEConfig config("kmilodrc"); KMilo::Monitor *monitor; diff --git a/kmilo/kmilod/monitor.cpp b/kmilo/kmilod/monitor.cpp index 7f37aaa..57caf59 100644 --- a/kmilo/kmilod/monitor.cpp +++ b/kmilo/kmilod/monitor.cpp @@ -30,7 +30,7 @@ KMilo::Monitor::Monitor(TQObject *parent, const char *name, const TQStringList&) KMilo::Monitor::~Monitor() { } -void KMilo::Monitor::reconfigure(KConfig*) +void KMilo::Monitor::reconfigure(TDEConfig*) { } diff --git a/kmilo/kmilod/monitor.h b/kmilo/kmilod/monitor.h index d50045b..e646a7e 100644 --- a/kmilo/kmilod/monitor.h +++ b/kmilo/kmilod/monitor.h @@ -30,7 +30,7 @@ #include -class KConfig; +class TDEConfig; namespace KMilo { class KMiloInterface; @@ -83,7 +83,7 @@ class KDE_EXPORT Monitor : public TQObject { bool shouldPoll() const { return _poll; } - virtual void reconfigure(KConfig*); + virtual void reconfigure(TDEConfig*); protected: bool _poll; // set to false to disable polling. diff --git a/kmilo/thinkpad/kcmthinkpad/main.cpp b/kmilo/thinkpad/kcmthinkpad/main.cpp index c418313..66803ca 100644 --- a/kmilo/thinkpad/kcmthinkpad/main.cpp +++ b/kmilo/thinkpad/kcmthinkpad/main.cpp @@ -55,7 +55,7 @@ K_EXPORT_COMPONENT_FACTORY( kcm_thinkpad, KCMThinkpadModuleFactory("kcmthinkpad" #define CONFIG_FILE "kmilodrc" KCMThinkpadModule::KCMThinkpadModule(TQWidget* parent, const char* name, const TQStringList&) - : KCModule(KCMThinkpadModuleFactory::instance(), parent, name) { + : TDECModule(KCMThinkpadModuleFactory::instance(), parent, name) { TDEAboutData* about = new TDEAboutData(I18N_NOOP("kcmthinkpad"), I18N_NOOP("TDE Control Module for IBM Thinkpad " @@ -132,7 +132,7 @@ void KCMThinkpadModule::save() { } DCOPClient client; - KConfig config(CONFIG_FILE); + TDEConfig config(CONFIG_FILE); config.setGroup("thinkpad"); config.writeEntry("run", m_KCMThinkpadGeneral->mCbRun->isChecked()); @@ -164,7 +164,7 @@ void KCMThinkpadModule::load() { } void KCMThinkpadModule::load(bool useDefaults) { - KConfig config(CONFIG_FILE); + TDEConfig config(CONFIG_FILE); config.setReadDefaults( useDefaults ); diff --git a/kmilo/thinkpad/kcmthinkpad/main.h b/kmilo/thinkpad/kcmthinkpad/main.h index 01c7a52..2621202 100644 --- a/kmilo/thinkpad/kcmthinkpad/main.h +++ b/kmilo/thinkpad/kcmthinkpad/main.h @@ -29,7 +29,7 @@ class KCMThinkPadGeneral; -class KCMThinkpadModule : public KCModule { +class KCMThinkpadModule : public TDECModule { Q_OBJECT diff --git a/kmilo/thinkpad/thinkpad.cpp b/kmilo/thinkpad/thinkpad.cpp index 034c6bd..2a57daa 100644 --- a/kmilo/thinkpad/thinkpad.cpp +++ b/kmilo/thinkpad/thinkpad.cpp @@ -53,7 +53,7 @@ ThinkPadMonitor::~ThinkPadMonitor() { bool ThinkPadMonitor::init() { - KConfig config("kmilodrc"); + TDEConfig config("kmilodrc"); reconfigure(&config); if (m_run) { @@ -436,7 +436,7 @@ void ThinkPadMonitor::showToggleMessage(TQString onMessage, TQString offMessage, _interface->displayText(message); } -void ThinkPadMonitor::reconfigure(KConfig* config) { +void ThinkPadMonitor::reconfigure(TDEConfig* config) { config->setGroup("thinkpad"); m_nvramFile = config->readEntry("nvram", "/dev/nvram"); diff --git a/kmilo/thinkpad/thinkpad.h b/kmilo/thinkpad/thinkpad.h index dc843ca..fe2b364 100644 --- a/kmilo/thinkpad/thinkpad.h +++ b/kmilo/thinkpad/thinkpad.h @@ -115,7 +115,7 @@ class ThinkPadMonitor : public Monitor { * Reimplemented from KMilo::Monitor. * Loads configuration from kmilorc */ - virtual void reconfigure(KConfig*); + virtual void reconfigure(TDEConfig*); private: /** * get the current state from the nvram diff --git a/ksim/ksimview.cpp b/ksim/ksimview.cpp index 8b991f2..572579c 100644 --- a/ksim/ksimview.cpp +++ b/ksim/ksimview.cpp @@ -63,7 +63,7 @@ #define MAXHOSTNAMELEN 64 #endif -KSim::MainView::MainView(KConfig *config, +KSim::MainView::MainView(TDEConfig *config, bool loadPlugins, KSim::PanelExtension *topLevel, const char *name) : DCOPObject("KSim"), TQWidget(topLevel, name) @@ -272,7 +272,7 @@ void KSim::MainView::reparseConfig(bool emitReload, for (plugin = pluginList.begin(); plugin != pluginList.end(); ++plugin) { if ((*plugin).configPage()) { (*plugin).configPage()->saveConfig(); - KConfig *conf = (*plugin).configPage()->config(); + TDEConfig *conf = (*plugin).configPage()->config(); if (conf) conf->sync(); } diff --git a/ksim/ksimview.h b/ksim/ksimview.h index c0404b8..7495076 100644 --- a/ksim/ksimview.h +++ b/ksim/ksimview.h @@ -33,7 +33,7 @@ class TQHBoxLayout; class TQVBoxLayout; class TQPopupMenu; class KDesktopFile; -class KConfig; +class TDEConfig; namespace KSim { @@ -52,7 +52,7 @@ namespace KSim // K_DCOP public: - MainView(KConfig *config, bool loadPlugins, + MainView(TDEConfig *config, bool loadPlugins, KSim::PanelExtension *topLevel, const char *name); diff --git a/ksim/library/ksimconfig.cpp b/ksim/library/ksimconfig.cpp index 2fd136e..3619f90 100644 --- a/ksim/library/ksimconfig.cpp +++ b/ksim/library/ksimconfig.cpp @@ -24,9 +24,9 @@ #include "ksimconfig.h" #include "themeloader.h" -KConfig *KSim::Config::mainConfig = 0; +TDEConfig *KSim::Config::mainConfig = 0; -KSim::Config::Config(KConfig *config) +KSim::Config::Config(TDEConfig *config) { mainConfig = config; } @@ -35,7 +35,7 @@ KSim::Config::~Config() { } -KConfig *KSim::Config::config() +TDEConfig *KSim::Config::config() { return mainConfig; } diff --git a/ksim/library/ksimconfig.h b/ksim/library/ksimconfig.h index c831f35..8f7376d 100644 --- a/ksim/library/ksimconfig.h +++ b/ksim/library/ksimconfig.h @@ -26,7 +26,7 @@ #include -class KConfig; +class TDEConfig; namespace KSim { @@ -36,10 +36,10 @@ namespace KSim class KDE_EXPORT Config { public: - Config(KConfig *config); + Config(TDEConfig *config); ~Config(); - static KConfig *config(); + static TDEConfig *config(); int width(int defaultWidth) const; void setWidth(int width); @@ -103,7 +103,7 @@ namespace KSim void setReColourThemes(bool); private: - static KConfig *mainConfig; + static TDEConfig *mainConfig; }; } #endif diff --git a/ksim/library/pluginmodule.cpp b/ksim/library/pluginmodule.cpp index abe6609..74128d9 100644 --- a/ksim/library/pluginmodule.cpp +++ b/ksim/library/pluginmodule.cpp @@ -76,7 +76,7 @@ const TQString &KSim::PluginObject::configFileName() const class KSim::PluginPage::Private { public: - KConfig *config; + TDEConfig *config; KSim::PluginObject *parent; }; @@ -86,7 +86,7 @@ KSim::PluginPage::PluginPage(KSim::PluginObject *parent, const char *name) d = new PluginPage::Private; d->parent = parent; if (parent && !parent->configFileName().isEmpty()) - d->config = new KConfig(parent->configFileName() + "rc"); + d->config = new TDEConfig(parent->configFileName() + "rc"); else { kdWarning() << className() << ": Can not create the config() " "pointer due to the parent being null" << endl; @@ -100,7 +100,7 @@ KSim::PluginPage::~PluginPage() delete d; } -KConfig *KSim::PluginPage::config() const +TDEConfig *KSim::PluginPage::config() const { if (d) return d->config; @@ -113,7 +113,7 @@ class KSim::PluginView::Private public: PluginObject *parent; TQPopupMenu *popupMenu; - KConfig *config; + TDEConfig *config; }; KSim::PluginView::PluginView(KSim::PluginObject *parent, const char *name) @@ -126,7 +126,7 @@ KSim::PluginView::PluginView(KSim::PluginObject *parent, const char *name) TQT_SLOT(showAbout()), 0, -1, 0); if (parent && !parent->configFileName().isEmpty()) - d->config = new KConfig(parent->configFileName() + "rc"); + d->config = new TDEConfig(parent->configFileName() + "rc"); else { kdWarning() << className() << ": Can not create the config() " "pointer due to the parent being null" << endl; @@ -142,7 +142,7 @@ KSim::PluginView::~PluginView() d = 0; } -KConfig *KSim::PluginView::config() const +TDEConfig *KSim::PluginView::config() const { return d->config; } diff --git a/ksim/library/pluginmodule.h b/ksim/library/pluginmodule.h index 78cc21b..b93a98e 100644 --- a/ksim/library/pluginmodule.h +++ b/ksim/library/pluginmodule.h @@ -25,7 +25,7 @@ #include class TQPopupMenu; -class KConfig; +class TDEConfig; #define KSIM_INIT_PLUGIN(className) \ extern "C" { \ @@ -139,7 +139,7 @@ namespace KSim * use this to get a config object unique to the plugin name, * eg: the plugin foo would have the config file foorc */ - KConfig *config() const; + TDEConfig *config() const; signals: void pageChanged(); @@ -178,7 +178,7 @@ namespace KSim * use this to get a config object unique to the plugin name, * eg: the plugin foo would have the config file foorc */ - KConfig *config() const; + TDEConfig *config() const; /** * the plugins popup menu */ diff --git a/ksim/library/themeloader.cpp b/ksim/library/themeloader.cpp index 60e2031..947ba73 100644 --- a/ksim/library/themeloader.cpp +++ b/ksim/library/themeloader.cpp @@ -47,7 +47,7 @@ class KSim::Theme::Private TQStringList file; TQStringList dFile; - KConfig *globalReader; + TDEConfig *globalReader; TQString altTheme; TQString location; const TQValueVector &fileNames; @@ -94,7 +94,7 @@ class KSim::ThemeLoader::Private public: TQValueVector fileNames; TQStringList imageTypes; - KConfig *globalReader; + TDEConfig *globalReader; bool recolour; TQColor pixelColour; }; @@ -764,7 +764,7 @@ KSim::Theme::Theme() KSim::Theme::Theme(const TQString &url, const TQString &fileName, int alt, const TQValueVector &vector, const TQStringList &list, - KConfig *globalReader) + TDEConfig *globalReader) { create(vector, list, globalReader); init(url, fileName, alt); @@ -774,7 +774,7 @@ KSim::Theme::Theme(const TQString &url, const TQString &fileName, int alt, } void KSim::Theme::create(const TQValueVector &vector, - const TQStringList &list, KConfig *globalReader) + const TQStringList &list, TDEConfig *globalReader) { d = new Private(vector, list); d->globalReader = globalReader; @@ -917,7 +917,7 @@ void KSim::ThemeLoader::reload() if (currentUrl() != defaultUrl()) { if (!d->globalReader) - d->globalReader = new KConfig(defaultUrl() + "gkrellmrc_ksim"); + d->globalReader = new TDEConfig(defaultUrl() + "gkrellmrc_ksim"); } else { delete d->globalReader; @@ -998,24 +998,24 @@ TQString KSim::ThemeLoader::parseConfig(const TQString &url, TQString line(origStream.readLine().simplifyWhiteSpace()); if (line.find(reg) == 0) // find the location of the * comments - // replace all * comments with # comments so KConfig doesn't complain + // replace all * comments with # comments so TDEConfig doesn't complain line.replace(reg, "#"); if (line.find("#") == -1) { // find the location of the string 'gkrellmms' if (line.findRev("=") == -1) { // if found we check for the string '=' int numLoc = line.findRev(numbers); if (numLoc != -1) - // if '=' doesn't exist we add one so KConfig doesn't complain + // if '=' doesn't exist we add one so TDEConfig doesn't complain line.insert(numLoc, " = "); numLoc = line.findRev(number); if (numLoc != -1) - // if '=' doesn't exist we add one so KConfig doesn't complain + // if '=' doesn't exist we add one so TDEConfig doesn't complain line.insert(numLoc, " = "); numLoc = line.findRev(minus); if (numLoc != -1) - // replace the '-' with an '=' so KConfig doesn't get confused + // replace the '-' with an '=' so TDEConfig doesn't get confused line.replace(TQRegExp("-"), "="); } } @@ -1186,7 +1186,7 @@ KSim::ThemeLoader::ThemeLoader() d->imageTypes << "png" << "jpg" << "jpeg" << "xpm" << "gif"; if (currentUrl() != defaultUrl()) - d->globalReader = new KConfig(defaultUrl() + "gkrellmrc_ksim"); + d->globalReader = new TDEConfig(defaultUrl() + "gkrellmrc_ksim"); else d->globalReader = 0; diff --git a/ksim/library/themeloader.h b/ksim/library/themeloader.h index 9206583..89ac67b 100644 --- a/ksim/library/themeloader.h +++ b/ksim/library/themeloader.h @@ -30,7 +30,7 @@ class TQStringList; template class TQValueVector; -class KConfig; +class TDEConfig; class TQWidget; namespace KSim @@ -372,8 +372,8 @@ namespace KSim Theme(); Theme(const TQString &url, const TQString &fileName, int alt, const TQValueVector &vector, const TQStringList &list, - KConfig *globalReader); - void create(const TQValueVector &, const TQStringList &, KConfig *); + TDEConfig *globalReader); + void create(const TQValueVector &, const TQStringList &, TDEConfig *); void init(const TQString &url, const TQString &fileName, int alt); void reparse(const TQString &url, const TQString &fileName, int alt); TQString parseConfig(const TQString &, const TQString &); diff --git a/ksim/monitors/i8k/ksimi8k.cpp b/ksim/monitors/i8k/ksimi8k.cpp index 211fd4d..eb7f7ee 100644 --- a/ksim/monitors/i8k/ksimi8k.cpp +++ b/ksim/monitors/i8k/ksimi8k.cpp @@ -54,7 +54,7 @@ KSim::PluginView *I8KPlugin::createView(const char *className) KSim::PluginPage *I8KPlugin::createConfigPage(const char *className) { - return new I8KConfig(this, className); + return new I8TDEConfig(this, className); } void I8KPlugin::showAbout() @@ -208,7 +208,7 @@ void I8KView::updateView() .arg( m_unit ) ); } -I8KConfig::I8KConfig(KSim::PluginObject *parent, const char *name) +I8TDEConfig::I8TDEConfig(KSim::PluginObject *parent, const char *name) : KSim::PluginPage(parent, name) { m_unit = new TQCheckBox( i18n( "Show temperature in Fahrenheit" ), @@ -228,11 +228,11 @@ I8KConfig::I8KConfig(KSim::PluginObject *parent, const char *name) layout->setRowStretch( 2, 1 ); } -I8KConfig::~I8KConfig() +I8TDEConfig::~I8TDEConfig() { } -void I8KConfig::readConfig() +void I8TDEConfig::readConfig() { config()->setGroup("I8KPlugin"); @@ -243,7 +243,7 @@ void I8KConfig::readConfig() m_interval->setValue( interval ); } -void I8KConfig::saveConfig() +void I8TDEConfig::saveConfig() { config()->setGroup("I8KPlugin"); diff --git a/ksim/monitors/i8k/ksimi8k.h b/ksim/monitors/i8k/ksimi8k.h index 09296ec..9c1ce1a 100644 --- a/ksim/monitors/i8k/ksimi8k.h +++ b/ksim/monitors/i8k/ksimi8k.h @@ -79,13 +79,13 @@ class I8KView : public KSim::PluginView TQRegExp *m_reData; }; -class I8KConfig : public KSim::PluginPage +class I8TDEConfig : public KSim::PluginPage { Q_OBJECT public: - I8KConfig(KSim::PluginObject *parent, const char *name); - ~I8KConfig(); + I8TDEConfig(KSim::PluginObject *parent, const char *name); + ~I8TDEConfig(); virtual void saveConfig(); virtual void readConfig(); diff --git a/ksim/monitors/lm_sensors/ksimsensors.h b/ksim/monitors/lm_sensors/ksimsensors.h index 4f66a8b..9c1e801 100644 --- a/ksim/monitors/lm_sensors/ksimsensors.h +++ b/ksim/monitors/lm_sensors/ksimsensors.h @@ -24,7 +24,7 @@ #include #include "ksimsensorsiface.h" -class KConfig; +class TDEConfig; class SensorList; class TDEInstance; diff --git a/ksim/monitors/snmp/chartmonitor.cpp b/ksim/monitors/snmp/chartmonitor.cpp index 1679eb6..47f5864 100644 --- a/ksim/monitors/snmp/chartmonitor.cpp +++ b/ksim/monitors/snmp/chartmonitor.cpp @@ -51,7 +51,7 @@ void ChartMonitor::setData( const Value &data ) setValue( currentValue ); if ( m_config.displayCurrentValueInline ) { TQ_UINT64 bytesPerSec = currentValue / ( m_config.refreshInterval.seconds + m_config.refreshInterval.minutes * 60 ); - setText( KIO::convertSize( bytesPerSec ), 0 ); + setText( TDEIO::convertSize( bytesPerSec ), 0 ); } } diff --git a/ksim/monitors/snmp/configpage.cpp b/ksim/monitors/snmp/configpage.cpp index ee50054..8e4102f 100644 --- a/ksim/monitors/snmp/configpage.cpp +++ b/ksim/monitors/snmp/configpage.cpp @@ -76,7 +76,7 @@ ConfigPage::~ConfigPage() void ConfigPage::saveConfig() { - KConfig &cfg = *config(); + TDEConfig &cfg = *config(); // collect garbage removeAllHostGroups(); @@ -92,7 +92,7 @@ void ConfigPage::saveConfig() void ConfigPage::readConfig() { - KConfig &cfg = *config(); + TDEConfig &cfg = *config(); cfg.setGroup( "General" ); TQStringList hosts = cfg.readListEntry( "Hosts" ); @@ -274,7 +274,7 @@ void ConfigPage::removeAllMonitorGroups() void ConfigPage::removeConfigGroups( const TQString &prefix ) { - KConfig &cfg = *config(); + TDEConfig &cfg = *config(); TQStringList groups = cfg.groupList(); for ( TQStringList::ConstIterator it = groups.begin(); it != groups.end(); ++it ) diff --git a/ksim/monitors/snmp/hostconfig.cpp b/ksim/monitors/snmp/hostconfig.cpp index 1188c12..844bee5 100644 --- a/ksim/monitors/snmp/hostconfig.cpp +++ b/ksim/monitors/snmp/hostconfig.cpp @@ -33,7 +33,7 @@ static int defaultSnmpPort() return ent->s_port; } -bool HostConfig::load( KConfigBase &config ) +bool HostConfig::load( TDEConfigBase &config ) { name = config.readEntry( "Host" ); if ( name.isEmpty() ) @@ -76,7 +76,7 @@ bool HostConfig::load( KConfigBase &config ) return true; } -void HostConfig::save( KConfigBase &config ) const +void HostConfig::save( TDEConfigBase &config ) const { if ( isNull() ) return; @@ -109,7 +109,7 @@ void HostConfig::save( KConfigBase &config ) const writeIfNotEmpty( config, "PrivPassphrase", KStringHandler::obscure( privacy.key ) ); } -void HostConfig::writeIfNotEmpty( KConfigBase &config, const TQString &name, const TQString &value ) +void HostConfig::writeIfNotEmpty( TDEConfigBase &config, const TQString &name, const TQString &value ) { if ( value.isEmpty() ) return; @@ -117,7 +117,7 @@ void HostConfig::writeIfNotEmpty( KConfigBase &config, const TQString &name, con config.writeEntry( name, value ); } -void HostConfigMap::load( KConfigBase &config, const TQStringList &hosts ) +void HostConfigMap::load( TDEConfigBase &config, const TQStringList &hosts ) { clear(); @@ -132,7 +132,7 @@ void HostConfigMap::load( KConfigBase &config, const TQStringList &hosts ) } } -TQStringList HostConfigMap::save( KConfigBase &config ) const +TQStringList HostConfigMap::save( TDEConfigBase &config ) const { TQStringList hostList; diff --git a/ksim/monitors/snmp/hostconfig.h b/ksim/monitors/snmp/hostconfig.h index af8a0fd..3726eb5 100644 --- a/ksim/monitors/snmp/hostconfig.h +++ b/ksim/monitors/snmp/hostconfig.h @@ -31,7 +31,7 @@ namespace Snmp struct HostConfig { HostConfig() {} - HostConfig( KConfigBase &config ) + HostConfig( TDEConfigBase &config ) { load( config ); } TQString name; // hostname @@ -56,8 +56,8 @@ struct HostConfig TQString key; } privacy; - bool load( KConfigBase &config ); - void save( KConfigBase &config ) const; + bool load( TDEConfigBase &config ); + void save( TDEConfigBase &config ) const; bool isNull() const { return name.isEmpty(); } @@ -65,7 +65,7 @@ struct HostConfig { return name == rhs.name; } private: - static void writeIfNotEmpty( KConfigBase &config, const TQString &name, const TQString &value ); + static void writeIfNotEmpty( TDEConfigBase &config, const TQString &name, const TQString &value ); }; struct HostConfigMap : public TQMap< TQString, HostConfig > @@ -74,8 +74,8 @@ struct HostConfigMap : public TQMap< TQString, HostConfig > HostConfigMap( const TQMap< TQString, HostConfig > &rhs ) : TQMap< TQString, HostConfig >( rhs ) {} - void load( KConfigBase &config, const TQStringList &hosts ); - TQStringList save( KConfigBase &config ) const; + void load( TDEConfigBase &config, const TQStringList &hosts ); + TQStringList save( TDEConfigBase &config ) const; }; } diff --git a/ksim/monitors/snmp/monitorconfig.cpp b/ksim/monitors/snmp/monitorconfig.cpp index 6ab85b6..d2dee45 100644 --- a/ksim/monitors/snmp/monitorconfig.cpp +++ b/ksim/monitors/snmp/monitorconfig.cpp @@ -33,7 +33,7 @@ MonitorConfig::MonitorConfig() displayCurrentValueInline = false; } -bool MonitorConfig::load( KConfigBase &config, const HostConfigMap &hosts ) +bool MonitorConfig::load( TDEConfigBase &config, const HostConfigMap &hosts ) { TQString hostName = config.readEntry( "Host" ); if ( hostName.isEmpty() ) @@ -74,7 +74,7 @@ bool MonitorConfig::load( KConfigBase &config, const HostConfigMap &hosts ) return true; } -void MonitorConfig::save( KConfigBase &config ) const +void MonitorConfig::save( TDEConfigBase &config ) const { if ( isNull() ) return; @@ -148,7 +148,7 @@ TQStringList KSim::Snmp::allDisplayTypes() return TQStringList() << "Label" << "Chart"; } -void MonitorConfigMap::load( KConfigBase &config, const TQStringList &names, const HostConfigMap &hosts ) +void MonitorConfigMap::load( TDEConfigBase &config, const TQStringList &names, const HostConfigMap &hosts ) { clear(); @@ -163,7 +163,7 @@ void MonitorConfigMap::load( KConfigBase &config, const TQStringList &names, con } } -TQStringList MonitorConfigMap::save( KConfigBase &config ) const +TQStringList MonitorConfigMap::save( TDEConfigBase &config ) const { TQStringList names; diff --git a/ksim/monitors/snmp/monitorconfig.h b/ksim/monitors/snmp/monitorconfig.h index cf2d525..5ad6a32 100644 --- a/ksim/monitors/snmp/monitorconfig.h +++ b/ksim/monitors/snmp/monitorconfig.h @@ -33,11 +33,11 @@ struct MonitorConfig enum DisplayType { Label = 0, Chart }; MonitorConfig(); - MonitorConfig( KConfigBase &config, const HostConfigMap &hosts ) + MonitorConfig( TDEConfigBase &config, const HostConfigMap &hosts ) { load( config, hosts ); } - bool load( KConfigBase &config, const HostConfigMap &hosts ); - void save( KConfigBase &config ) const; + bool load( TDEConfigBase &config, const HostConfigMap &hosts ); + void save( TDEConfigBase &config ) const; bool isNull() const { return name.isEmpty() || host.isNull(); } @@ -65,8 +65,8 @@ struct MonitorConfigMap : public TQMap< TQString, MonitorConfig > MonitorConfigMap( const TQMap< TQString, MonitorConfig > &rhs ) : TQMap< TQString, MonitorConfig >( rhs ) {} - void load( KConfigBase &config, const TQStringList &names, const HostConfigMap &hosts ); - TQStringList save( KConfigBase &config ) const; + void load( TDEConfigBase &config, const TQStringList &names, const HostConfigMap &hosts ); + TQStringList save( TDEConfigBase &config ) const; }; typedef TQValueList MonitorConfigList; diff --git a/ksim/monitors/snmp/view.cpp b/ksim/monitors/snmp/view.cpp index 9515645..ec26949 100644 --- a/ksim/monitors/snmp/view.cpp +++ b/ksim/monitors/snmp/view.cpp @@ -47,7 +47,7 @@ void View::reparseConfig() m_widgets.clear(); m_widgets.setAutoDelete( false ); - KConfig &cfg = *config(); + TDEConfig &cfg = *config(); cfg.setGroup( "General" ); TQStringList allHosts = cfg.readListEntry( "Hosts" ); TQStringList monitors = cfg.readListEntry( "Monitors" ); diff --git a/ktimer/ktimer.cpp b/ktimer/ktimer.cpp index cff3083..43808fb 100644 --- a/ktimer/ktimer.cpp +++ b/ktimer/ktimer.cpp @@ -244,7 +244,7 @@ void KTimerPref::jobFinished( KTimerJob *job, bool error ) } -void KTimerPref::saveJobs( KConfig *cfg ) +void KTimerPref::saveJobs( TDEConfig *cfg ) { int num = 0; KTimerJobItem *item = static_cast(m_list->firstChild()); @@ -261,7 +261,7 @@ void KTimerPref::saveJobs( KConfig *cfg ) } -void KTimerPref::loadJobs( KConfig *cfg ) +void KTimerPref::loadJobs( TDEConfig *cfg ) { cfg->setGroup( "Jobs" ); int num = cfg->readNumEntry( "Number", 0 ); @@ -330,7 +330,7 @@ KTimerJob::~KTimerJob() } -void KTimerJob::load( KConfig *cfg, const TQString& grp ) +void KTimerJob::load( TDEConfig *cfg, const TQString& grp ) { cfg->setGroup( grp ); cfg->writeEntry( "Delay", d->delay ); @@ -341,7 +341,7 @@ void KTimerJob::load( KConfig *cfg, const TQString& grp ) } -void KTimerJob::save( KConfig *cfg, const TQString& grp ) +void KTimerJob::save( TDEConfig *cfg, const TQString& grp ) { cfg->setGroup( grp ); setDelay( cfg->readNumEntry( "Delay", 100 ) ); diff --git a/ktimer/ktimer.h b/ktimer/ktimer.h index 0a646fb..41b1822 100644 --- a/ktimer/ktimer.h +++ b/ktimer/ktimer.h @@ -46,8 +46,8 @@ class KTimerJob : public TQObject { void *user(); void setUser( void *user ); - void load( KConfig *cfg, const TQString& grp ); - void save( KConfig *cfg, const TQString& grp ); + void load( TDEConfig *cfg, const TQString& grp ); + void save( TDEConfig *cfg, const TQString& grp ); public slots: void setDelay( unsigned sec ); @@ -101,8 +101,8 @@ class KTimerPref : public PrefWidget void remove(); void currentChanged( TQListViewItem * ); - void saveJobs( KConfig *cfg ); - void loadJobs( KConfig *cfg ); + void saveJobs( TDEConfig *cfg ); + void loadJobs( TDEConfig *cfg ); private slots: void jobChanged( KTimerJob *job ); diff --git a/kwallet/allyourbase.cpp b/kwallet/allyourbase.cpp index b7dbc64..b75a04f 100644 --- a/kwallet/allyourbase.cpp +++ b/kwallet/allyourbase.cpp @@ -282,13 +282,13 @@ void KWalletItem::dropped(TQDropEvent *e, const TQValueList& lst return; } TQString tmpFile; - if (KIO::NetAccess::download(u, tmpFile, 0L)) { + if (TDEIO::NetAccess::download(u, tmpFile, 0L)) { file.setName(tmpFile); file.open(IO_ReadOnly); ds = new TQDataStream(&file); - KIO::NetAccess::removeTempFile(tmpFile); + TDEIO::NetAccess::removeTempFile(tmpFile); } else { - KMessageBox::error(iconView(), KIO::NetAccess::lastErrorString()); + KMessageBox::error(iconView(), TDEIO::NetAccess::lastErrorString()); } } if (ds) { @@ -439,7 +439,7 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) { return; } TQString tmpFile; - if (KIO::NetAccess::download(u, tmpFile, 0L)) { + if (TDEIO::NetAccess::download(u, tmpFile, 0L)) { file.setName(tmpFile); file.open(IO_ReadOnly); ds = new TQDataStream(&file); @@ -459,9 +459,9 @@ void KWalletEntryList::itemDropped(TQDropEvent *e, TQListViewItem *item) { //set the file back to the beginning file.reset(); ds = new TQDataStream(&file); - KIO::NetAccess::removeTempFile(tmpFile); + TDEIO::NetAccess::removeTempFile(tmpFile); } else { - KMessageBox::error(this, KIO::NetAccess::lastErrorString()); + KMessageBox::error(this, TDEIO::NetAccess::lastErrorString()); return; } } else { @@ -662,7 +662,7 @@ void KWalletIconView::slotDropped(TQDropEvent *e, const TQValueListaccept(); } diff --git a/kwallet/konfigurator/konfigurator.cpp b/kwallet/konfigurator/konfigurator.cpp index 3506f58..dd03591 100644 --- a/kwallet/konfigurator/konfigurator.cpp +++ b/kwallet/konfigurator/konfigurator.cpp @@ -41,7 +41,7 @@ typedef KGenericFactory KWalletFactory; K_EXPORT_COMPONENT_FACTORY(kcm_kwallet, KWalletFactory("kcmkwallet")) KWalletConfig::KWalletConfig(TQWidget *parent, const char *name, const TQStringList&) -: KCModule(KWalletFactory::instance(), parent, name) { +: TDECModule(KWalletFactory::instance(), parent, name) { TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmkwallet"), @@ -51,7 +51,7 @@ KWalletConfig::KWalletConfig(TQWidget *parent, const char *name, const TQStringL about->addAuthor("George Staikos", 0, "staikos@kde.org"); setAboutData( about ); - _cfg = new KConfig("kwalletrc", false, false); + _cfg = new TDEConfig("kwalletrc", false, false); TQVBoxLayout *vbox = new TQVBoxLayout(this, 0, KDialog::spacingHint()); vbox->add(_wcw = new WalletConfigWidget(this)); @@ -182,7 +182,7 @@ void KWalletConfig::load() { } void KWalletConfig::load(bool useDefaults) { - KConfigGroup config(_cfg, "Wallet"); + TDEConfigGroup config(_cfg, "Wallet"); config.setReadDefaults( useDefaults ); _wcw->_enabled->setChecked(config.readBoolEntry("Enabled", true)); _wcw->_openPrompt->setChecked(config.readBoolEntry("Prompt on Open", true)); @@ -235,7 +235,7 @@ void KWalletConfig::load(bool useDefaults) { void KWalletConfig::save() { - KConfigGroup config(_cfg, "Wallet"); + TDEConfigGroup config(_cfg, "Wallet"); config.writeEntry("Enabled", _wcw->_enabled->isChecked()); config.writeEntry("Launch Manager", _wcw->_launchManager->isChecked()); config.writeEntry("Leave Manager Open", !_wcw->_autocloseManager->isChecked()); diff --git a/kwallet/konfigurator/konfigurator.h b/kwallet/konfigurator/konfigurator.h index 28fef08..5b833ba 100644 --- a/kwallet/konfigurator/konfigurator.h +++ b/kwallet/konfigurator/konfigurator.h @@ -22,11 +22,11 @@ #include -class KConfig; +class TDEConfig; class WalletConfigWidget; class TQListViewItem; -class KWalletConfig : public KCModule { +class KWalletConfig : public TDECModule { Q_OBJECT public: @@ -52,7 +52,7 @@ class KWalletConfig : public KCModule { private: WalletConfigWidget *_wcw; - KConfig *_cfg; + TDEConfig *_cfg; }; #endif diff --git a/kwallet/kwalleteditor.cpp b/kwallet/kwalleteditor.cpp index 69dbb48..83c69f8 100644 --- a/kwallet/kwalleteditor.cpp +++ b/kwallet/kwalleteditor.cpp @@ -817,7 +817,7 @@ void KWalletEditor::importWallet() { } TQString tmpFile; - if (!KIO::NetAccess::download(url, tmpFile, this)) { + if (!TDEIO::NetAccess::download(url, tmpFile, this)) { KMessageBox::sorry(this, i18n("Unable to access wallet '%1'.").arg(url.prettyURL())); return; } @@ -932,7 +932,7 @@ void KWalletEditor::importWallet() { delete w; - KIO::NetAccess::removeTempFile(tmpFile); + TDEIO::NetAccess::removeTempFile(tmpFile); updateFolderList(true); restoreEntry(); } @@ -945,7 +945,7 @@ void KWalletEditor::importXML() { } TQString tmpFile; - if (!KIO::NetAccess::download(url, tmpFile, this)) { + if (!TDEIO::NetAccess::download(url, tmpFile, this)) { KMessageBox::sorry(this, i18n("Unable to access XML file '%1'.").arg(url.prettyURL())); return; } @@ -953,21 +953,21 @@ void KWalletEditor::importXML() { TQFile qf(tmpFile); if (!qf.open(IO_ReadOnly)) { KMessageBox::sorry(this, i18n("Error opening XML file '%1' for input.").arg(url.prettyURL())); - KIO::NetAccess::removeTempFile(tmpFile); + TDEIO::NetAccess::removeTempFile(tmpFile); return; } TQDomDocument doc(tmpFile); if (!doc.setContent(&qf)) { KMessageBox::sorry(this, i18n("Error reading XML file '%1' for input.").arg(url.prettyURL())); - KIO::NetAccess::removeTempFile(tmpFile); + TDEIO::NetAccess::removeTempFile(tmpFile); return; } TQDomElement top = doc.documentElement(); if (top.tagName().lower() != "wallet") { KMessageBox::sorry(this, i18n("Error: XML file does not contain a wallet.")); - KIO::NetAccess::removeTempFile(tmpFile); + TDEIO::NetAccess::removeTempFile(tmpFile); return; } @@ -1038,7 +1038,7 @@ void KWalletEditor::importXML() { n = n.nextSibling(); } - KIO::NetAccess::removeTempFile(tmpFile); + TDEIO::NetAccess::removeTempFile(tmpFile); updateFolderList(true); restoreEntry(); } @@ -1105,7 +1105,7 @@ void KWalletEditor::exportXML() { if (!url.isEmpty()) { bool ok = true; - if (KIO::NetAccess::exists(url, false, this)) { + if (TDEIO::NetAccess::exists(url, false, this)) { int rc = KMessageBox::warningContinueCancel(this, i18n("The file '%1' already exists. Would you like to overwrite this file?").arg(url.prettyURL()), i18n("Overwrite")); if (rc == KMessageBox::Cancel) { ok = false; @@ -1113,7 +1113,7 @@ void KWalletEditor::exportXML() { } if (ok) { KURL tfURL; tfURL.setPath(tf.name()); - KIO::NetAccess::file_copy(tfURL, url, 0600, true, false, this); + TDEIO::NetAccess::file_copy(tfURL, url, 0600, true, false, this); } } } @@ -1129,11 +1129,11 @@ void KWalletEditor::saveAs() { if (!url.isEmpty()) { // Sync() kwalletd if (_nonLocal) { - KIO::NetAccess::file_copy(KURL(_walletName), url, 0600, false, false, this); + TDEIO::NetAccess::file_copy(KURL(_walletName), url, 0600, false, false, this); } else { TQString path = TDEGlobal::dirs()->saveLocation("kwallet") + "/" + _walletName + ".kwl"; KURL destURL; destURL.setPath(path); - KIO::NetAccess::file_copy(destURL, url, 0600, false, false, this); + TDEIO::NetAccess::file_copy(destURL, url, 0600, false, false, this); } } } diff --git a/kwallet/kwalletmanager.cpp b/kwallet/kwalletmanager.cpp index 20ab41d..7457682 100644 --- a/kwallet/kwalletmanager.cpp +++ b/kwallet/kwalletmanager.cpp @@ -54,8 +54,8 @@ KWalletManager::KWalletManager(TQWidget *parent, const char *name, WFlags f) TDEApplication::dcopClient()->setQtBridgeEnabled(false); _shuttingDown = false; - KConfig cfg("kwalletrc"); // not sure why this setting isn't in kwalletmanagerrc... - KConfigGroup walletConfigGroup(&cfg, "Wallet"); + TDEConfig cfg("kwalletrc"); // not sure why this setting isn't in kwalletmanagerrc... + TDEConfigGroup walletConfigGroup(&cfg, "Wallet"); _dcopRef = 0L; if (walletConfigGroup.readBoolEntry("Launch Manager", true)) { _tray = new KSystemTray(this, "kwalletmanager tray"); @@ -326,7 +326,7 @@ void KWalletManager::allWalletsClosed() { void KWalletManager::possiblyQuit() { - KConfig cfg("kwalletrc"); + TDEConfig cfg("kwalletrc"); cfg.setGroup("Wallet"); if (_windows.isEmpty() && !isVisible() && @@ -412,8 +412,8 @@ TQPixmap KWalletManager::loadSystemTrayIcon(const TQString &icon) { #if KDE_IS_VERSION(3, 1, 90) return KSystemTray::loadIcon(icon); #else - KConfig *appCfg = kapp->config(); - KConfigGroupSaver configSaver(appCfg, "System Tray"); + TDEConfig *appCfg = kapp->config(); + TDEConfigGroupSaver configSaver(appCfg, "System Tray"); int iconWidth = appCfg->readNumEntry("systrayIconWidth", 22); return kapp->iconLoader()->loadIcon( icon, KIcon::Panel, iconWidth ); #endif diff --git a/superkaramba/ChangeLog b/superkaramba/ChangeLog index f25e8ee..8cc4296 100644 --- a/superkaramba/ChangeLog +++ b/superkaramba/ChangeLog @@ -128,7 +128,7 @@ xml index file support to skz themes ------------------------------------------------------------------------ r419386 | pdamsten | 2005-05-29 06:24:45 -0400 (Sun, 29 May 2005) | 1 line -KIO::NetAccess support for themes. +TDEIO::NetAccess support for themes. ------------------------------------------------------------------------ r419557 | pdamsten | 2005-05-29 16:19:15 -0400 (Sun, 29 May 2005) | 1 line @@ -179,7 +179,7 @@ Save user added themes to config file. ------------------------------------------------------------------------ r421472 | pdamsten | 2005-06-03 03:58:55 -0400 (Fri, 03 Jun 2005) | 1 line -KConfigXT files. +TDEConfigXT files. ------------------------------------------------------------------------ r421480 | pdamsten | 2005-06-03 04:27:04 -0400 (Fri, 03 Jun 2005) | 1 line diff --git a/superkaramba/src/imagelabel.cpp b/superkaramba/src/imagelabel.cpp index 9df0834..64c523f 100644 --- a/superkaramba/src/imagelabel.cpp +++ b/superkaramba/src/imagelabel.cpp @@ -255,13 +255,13 @@ void ImageLabel::applyTransformations(bool useSmoothScale) setHeight(pixmap.height()); } -void ImageLabel::slotCopyResult(KIO::Job* job) +void ImageLabel::slotCopyResult(TDEIO::Job* job) { - TQString tempFile = ((KIO::FileCopyJob*)job)->destURL().path(); + TQString tempFile = ((TDEIO::FileCopyJob*)job)->destURL().path(); if(job->error() == 0) { setValue(tempFile); - imagePath = ((KIO::FileCopyJob*)job)->srcURL().path(); + imagePath = ((TDEIO::FileCopyJob*)job)->srcURL().path(); emit pixmapLoaded(); } else @@ -269,7 +269,7 @@ void ImageLabel::slotCopyResult(KIO::Job* job) tqWarning("Error downloading (%s): %s", job->errorText().ascii(), tempFile.ascii()); } - KIO::NetAccess::removeTempFile(tempFile); + TDEIO::NetAccess::removeTempFile(tempFile); } void ImageLabel::setValue(TQString fn) @@ -285,10 +285,10 @@ void ImageLabel::setValue(TQString fn) if(protocol && url.isLocalFile() == false) { KTempFile tmpFile; - KIO::FileCopyJob* copy = KIO::file_copy(fileName, tmpFile.name(), 0600, + TDEIO::FileCopyJob* copy = TDEIO::file_copy(fileName, tmpFile.name(), 0600, true, false, false); - connect(copy, TQT_SIGNAL(result(KIO::Job*)), - this, TQT_SLOT(slotCopyResult(KIO::Job*))); + connect(copy, TQT_SIGNAL(result(TDEIO::Job*)), + this, TQT_SLOT(slotCopyResult(TDEIO::Job*))); return; } else @@ -446,13 +446,13 @@ void ImageLabel::parseImages(TQString fn, TQString fn_roll, int _xoff, { TQString tmpFile; #if defined(KDE_3_2) - if(KIO::NetAccess::download(KURL(path), tmpFile, karambaApp->parentWindow())) + if(TDEIO::NetAccess::download(KURL(path), tmpFile, karambaApp->parentWindow())) #else - if(KIO::NetAccess::download(KURL(path), tmpFile)) + if(TDEIO::NetAccess::download(KURL(path), tmpFile)) #endif { pixmap_off = KPixmap(tmpFile); - KIO::NetAccess::removeTempFile(tmpFile); + TDEIO::NetAccess::removeTempFile(tmpFile); tqDebug( "Downloaded: %s to %s", path.ascii(), tmpFile.ascii() ); } else @@ -494,13 +494,13 @@ void ImageLabel::parseImages(TQString fn, TQString fn_roll, int _xoff, { TQString tmpFile; #if defined(KDE_3_2) - if(KIO::NetAccess::download(KURL(path), tmpFile, karambaApp->parentWindow())) + if(TDEIO::NetAccess::download(KURL(path), tmpFile, karambaApp->parentWindow())) #else - if(KIO::NetAccess::download(KURL(path), tmpFile)) + if(TDEIO::NetAccess::download(KURL(path), tmpFile)) #endif { pixmap_on = KPixmap(tmpFile); - KIO::NetAccess::removeTempFile(tmpFile); + TDEIO::NetAccess::removeTempFile(tmpFile); tqDebug( "Downloaded: %s to %s", path.ascii(), tmpFile.ascii()); } else diff --git a/superkaramba/src/imagelabel.h b/superkaramba/src/imagelabel.h index 820c214..bf4189c 100644 --- a/superkaramba/src/imagelabel.h +++ b/superkaramba/src/imagelabel.h @@ -38,7 +38,7 @@ #include "karamba.h" class ImageLabel; -class KIO::CopyJob; +class TDEIO::CopyJob; // Abstract Effects Baseclass class Effect : public TQObject @@ -144,7 +144,7 @@ private slots: // gets called if a timed effects needs to bee removed void slotEffectExpired(); - void slotCopyResult(KIO::Job* job); + void slotCopyResult(TDEIO::Job* job); signals: void pixmapLoaded(); diff --git a/superkaramba/src/karamba.cpp b/superkaramba/src/karamba.cpp index da9eec7..c61f6f8 100644 --- a/superkaramba/src/karamba.cpp +++ b/superkaramba/src/karamba.cpp @@ -108,7 +108,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, widgetUpdate = true; - // Creates KConfig Object + // Creates TDEConfig Object TQString instanceString; if(m_instance > 1) instanceString = TQString("-%1").arg(m_instance); @@ -124,7 +124,7 @@ karamba::karamba(TQString fn, TQString name, bool reloading, int instance, themeConfigFile.close(); } - config = new KConfig(cfg, false, false); + config = new TDEConfig(cfg, false, false); config -> sync(); config -> setGroup("internal"); @@ -1916,7 +1916,7 @@ void karamba::receivedStdout (TDEProcess *proc, char *buffer, int) } //For KDE session management -void karamba::saveProperties(KConfig* config) +void karamba::saveProperties(TDEConfig* config) { //tqDebug("karamba::saveProperties"); config->setGroup("session"); @@ -1925,7 +1925,7 @@ void karamba::saveProperties(KConfig* config) } //For KDE session management -void karamba::readProperties(KConfig* config) +void karamba::readProperties(TDEConfig* config) { //tqDebug("karamba::readProperties"); config->setGroup("session"); diff --git a/superkaramba/src/karamba.h b/superkaramba/src/karamba.h index 35c16e8..572451d 100644 --- a/superkaramba/src/karamba.h +++ b/superkaramba/src/karamba.h @@ -155,7 +155,7 @@ public: void keyPressed(const TQString& s, const Meter* meter); int numberOfConfMenuItems; - KConfig* config; + TDEConfig* config; TQString prettyName; bool m_sub_theme; bool isSubTheme() { return m_sub_theme; } @@ -190,8 +190,8 @@ protected: void keyPressEvent ( TQKeyEvent * e ); void closeEvent ( TQCloseEvent *); void paintEvent ( TQPaintEvent *); - void saveProperties(KConfig *); - void readProperties(KConfig *); + void saveProperties(TDEConfig *); + void readProperties(TDEConfig *); void dragEnterEvent(TQDragEnterEvent* event); void dropEvent(TQDropEvent* event); diff --git a/superkaramba/src/karambaapp.cpp b/superkaramba/src/karambaapp.cpp index cd2e77c..3e69df6 100644 --- a/superkaramba/src/karambaapp.cpp +++ b/superkaramba/src/karambaapp.cpp @@ -243,7 +243,7 @@ void KarambaApplication::checkPreviousSession(TDEApplication &app, */ if (app.isSessionRestored()) { - KConfig* config = app.sessionConfig(); + TDEConfig* config = app.sessionConfig(); config->setGroup("General Options"); TQString restartThemes = config->readEntry("OpenThemes"); diff --git a/superkaramba/src/karambasessionmanaged.cpp b/superkaramba/src/karambasessionmanaged.cpp index 8997561..ca41515 100644 --- a/superkaramba/src/karambasessionmanaged.cpp +++ b/superkaramba/src/karambasessionmanaged.cpp @@ -28,7 +28,7 @@ bool KarambaSessionManaged::saveState(TQSessionManager&) { - KConfig* config = kapp->sessionConfig(); + TDEConfig* config = kapp->sessionConfig(); config->setGroup("General Options"); diff --git a/superkaramba/src/rsssensor.cpp b/superkaramba/src/rsssensor.cpp index 7754a9c..30ccf61 100644 --- a/superkaramba/src/rsssensor.cpp +++ b/superkaramba/src/rsssensor.cpp @@ -48,9 +48,9 @@ void RssSensor::update() bool OK = false; #if defined(KDE_3_3) - if(KIO::NetAccess::download(KURL(source), tmpFile, karambaApp->parentWindow())) + if(TDEIO::NetAccess::download(KURL(source), tmpFile, karambaApp->parentWindow())) #else - if(KIO::NetAccess::download(KURL(source), tmpFile)) + if(TDEIO::NetAccess::download(KURL(source), tmpFile)) #endif { file.setName(tmpFile); @@ -130,7 +130,7 @@ void RssSensor::update() } // Cleanup file.close(); - KIO::NetAccess::removeTempFile( tmpFile ); + TDEIO::NetAccess::removeTempFile( tmpFile ); } #include "rsssensor.moc" diff --git a/superkaramba/src/sknewstuff.cpp b/superkaramba/src/sknewstuff.cpp index 683219e..814cf05 100644 --- a/superkaramba/src/sknewstuff.cpp +++ b/superkaramba/src/sknewstuff.cpp @@ -88,11 +88,11 @@ bool SKNewStuff::install( const TQString &fileName ) //as a .zip instead of .bz2 or .tar.gz KURL sourceFile(fileName); KURL destFile( destDir + sourceFile.fileName() ); - if(!KIO::NetAccess::file_copy( sourceFile, destFile )) + if(!TDEIO::NetAccess::file_copy( sourceFile, destFile )) { return false; } - KIO::NetAccess::removeTempFile( sourceFile.url() ); + TDEIO::NetAccess::removeTempFile( sourceFile.url() ); //Add the skz theme to the Theme Dialog mDlg->addSkzThemeToDialog(destFile.path()); } diff --git a/superkaramba/src/taskbartest.cpp b/superkaramba/src/taskbartest.cpp index c733d67..f7d742b 100644 --- a/superkaramba/src/taskbartest.cpp +++ b/superkaramba/src/taskbartest.cpp @@ -66,7 +66,7 @@ int main(int argc, char **argv) // // KSGRD::SensorMgr foo ;// p->engage( "" ); -// //KConfig *kconfig = TDEGlobal::config(); +// //TDEConfig *kconfig = TDEGlobal::config(); // //kconfig->setGroup("karamba"); // //kconfig->writeEntry("test", "/home/hk/foofoo"); // //kconfig->sync(); diff --git a/superkaramba/src/taskmanager.cpp b/superkaramba/src/taskmanager.cpp index 27e3a74..7e977d4 100644 --- a/superkaramba/src/taskmanager.cpp +++ b/superkaramba/src/taskmanager.cpp @@ -80,7 +80,7 @@ TaskManager::~TaskManager() void TaskManager::configure_startup() { - KConfig c("klaunchrc", true); + TDEConfig c("klaunchrc", true); c.setGroup("FeedbackStyle"); if (!c.readBoolEntry("TaskbarButton", true)) return; diff --git a/superkaramba/src/themefile.cpp b/superkaramba/src/themefile.cpp index a75cc14..c1392c6 100644 --- a/superkaramba/src/themefile.cpp +++ b/superkaramba/src/themefile.cpp @@ -232,7 +232,7 @@ bool ThemeFile::set(const KURL &url) return false; } } - if(!KIO::NetAccess::file_copy(url, localFile.filePath(), -1, true, + if(!TDEIO::NetAccess::file_copy(url, localFile.filePath(), -1, true, false, kapp->mainWidget())) { return false; diff --git a/superkaramba/src/themelocale.cpp b/superkaramba/src/themelocale.cpp index 8d8891f..1b7314c 100644 --- a/superkaramba/src/themelocale.cpp +++ b/superkaramba/src/themelocale.cpp @@ -171,7 +171,7 @@ void ThemeLocale::setLanguage(const TQStringList &languages) TQStringList ThemeLocale::languageList() { - KConfig* config = TDEGlobal::instance()->config(); + TDEConfig* config = TDEGlobal::instance()->config(); // Reset the list and add the new languages TQStringList languageList; languageList += diff --git a/superkaramba/src/themesdlg.cpp b/superkaramba/src/themesdlg.cpp index a726238..4b13c6b 100644 --- a/superkaramba/src/themesdlg.cpp +++ b/superkaramba/src/themesdlg.cpp @@ -217,7 +217,7 @@ void ThemesDlg::openLocalTheme() void ThemesDlg::getNewStuff() { #ifdef HAVE_KNEWSTUFF - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("KNewStuff"); config->writePathEntry("ProvidersUrl", TQString::fromLatin1("http://download.kde.org/khotnewstuff/karamba-providers.xml")); @@ -301,7 +301,7 @@ void ThemesDlg::addThemeToDialog(const KArchiveDirectory *archiveDir, void ThemesDlg::writeNewStuffConfig(const TQString &file) { #ifdef HAVE_KNEWSTUFF - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); TQStringList keys = config->entryMap("KNewStuffStatus").keys(); for(TQStringList::Iterator it = m_newStuffStatus.begin(); @@ -321,7 +321,7 @@ void ThemesDlg::writeNewStuffConfig(const TQString &file) void ThemesDlg::configSanityCheck() { #ifdef HAVE_KNEWSTUFF - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); TQStringList statusKeys = config->entryMap("KNewStuffStatus").keys(); TQStringList nameKeys = config->entryMap("KNewStuffNames").keys(); TQStringList removeList; @@ -427,7 +427,7 @@ bool ThemesDlg::filter(int index, TQWidget* widget, void* data) bool ThemesDlg::isDownloaded( const TQString& path ) { kdDebug() << "isDownloaded path: " << path << endl; - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("KNewStuffNames"); return !config->readEntry(path).isEmpty(); } @@ -454,7 +454,7 @@ void ThemesDlg::uninstall() TQDir remDir(remPath.dir()); remDir.cdUp(); kdDebug() << "moving " << remDir.path() << " to the trash" << endl; - KIO::move(remDir.path(), trash); + TDEIO::move(remDir.path(), trash); } tableThemes->removeItem(w); @@ -478,7 +478,7 @@ void ThemesDlg::uninstall() } #ifdef HAVE_KNEWSTUFF // Remove theme from KNewStuffStatus - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("KNewStuffNames"); TQString name = config->readEntry(tempPath); if(!name.isEmpty()) @@ -503,12 +503,12 @@ void ThemesDlg::uninstall() TQFileInfo remPath(theme.path()); TQDir remDir(remPath.dir()); kdDebug() << "moving " << remDir.path() << " to the trash" << endl; - KIO::move(remDir.path(), trash); + TDEIO::move(remDir.path(), trash); } tableThemes->removeItem(w); #ifdef HAVE_KNEWSTUFF // Remove theme from KNewStuffStatus - KConfig* config = TDEGlobal::config(); + TDEConfig* config = TDEGlobal::config(); config->setGroup("KNewStuffNames"); TQString name = config->readEntry(theme.path()); if(!name.isEmpty()) -- cgit v1.2.3