From 3c5631f74d1c75204f950140331e10f739082ee9 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:33:36 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- kuickshow/src/filefinder.cpp | 8 ++++---- kuickshow/src/filewidget.cpp | 4 ++-- kuickshow/src/imagewindow.cpp | 6 +++--- kuickshow/src/imdata.cpp | 4 ++-- kuickshow/src/imdata.h | 6 +++--- kuickshow/src/kuickdata.cpp | 4 ++-- kuickshow/src/kuickdata.h | 2 +- kuickshow/src/kuickfile.cpp | 18 +++++++++--------- kuickshow/src/kuickfile.h | 8 ++++---- kuickshow/src/kuickshow.cpp | 18 +++++++++--------- kuickshow/src/kuickshow.h | 6 +++--- 11 files changed, 42 insertions(+), 42 deletions(-) (limited to 'kuickshow') diff --git a/kuickshow/src/filefinder.cpp b/kuickshow/src/filefinder.cpp index f6a07e32..4f0d054a 100644 --- a/kuickshow/src/filefinder.cpp +++ b/kuickshow/src/filefinder.cpp @@ -51,8 +51,8 @@ FileFinder::FileFinder( TQWidget *parent, const char *name ) setAutoDeleteCompletionObject( true ); setFocusPolicy( TQ_ClickFocus ); - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver cs( config, "GeneralConfiguration" ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver cs( config, "GeneralConfiguration" ); setCompletionMode( (TDEGlobalSettings::Completion) config->readNumEntry( "FileFinderCompletionMode", TDEGlobalSettings::completionMode())); @@ -60,8 +60,8 @@ FileFinder::FileFinder( TQWidget *parent, const char *name ) FileFinder::~FileFinder() { - KConfig *config = TDEGlobal::config(); - KConfigGroupSaver cs( config, "GeneralConfiguration" ); + TDEConfig *config = TDEGlobal::config(); + TDEConfigGroupSaver cs( config, "GeneralConfiguration" ); config->writeEntry( "FileFinderCompletionMode", completionMode() ); } diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp index ae7e79b6..9f158c1a 100644 --- a/kuickshow/src/filewidget.cpp +++ b/kuickshow/src/filewidget.cpp @@ -229,8 +229,8 @@ bool FileWidget::eventFilter( TQObject *o, TQEvent *e ) } -// KIO::NetAccess::stat() does NOT give us the right mimetype, while -// KIO::NetAccess::mimetype() does. So we have this hacklet to tell +// TDEIO::NetAccess::stat() does NOT give us the right mimetype, while +// TDEIO::NetAccess::mimetype() does. So we have this hacklet to tell // showImage that the KFileItem is really an image. #define IS_IMAGE 5 #define MY_TYPE 55 diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp index 6b71a758..558e4c71 100644 --- a/kuickshow/src/imagewindow.cpp +++ b/kuickshow/src/imagewindow.cpp @@ -839,10 +839,10 @@ void ImageWindow::dropEvent( TQDropEvent *e ) if ( KURLDrag::decode( e, list ) && !list.isEmpty()) { TQString tmpFile; const KURL &url = list.first(); - if (KIO::NetAccess::download( url, tmpFile, this ) ) + if (TDEIO::NetAccess::download( url, tmpFile, this ) ) { loadImage( tmpFile ); - KIO::NetAccess::removeTempFile( tmpFile ); + TDEIO::NetAccess::removeTempFile( tmpFile ); } updateWidget(); e->accept(); @@ -1006,7 +1006,7 @@ bool ImageWindow::saveImage( const KURL& dest, bool keepOriginalSize ) { if ( isFullscreen() ) toggleFullscreen(); // otherwise upload window would block us invisibly - success = KIO::NetAccess::upload( saveFile, dest, const_cast( this ) ); + success = TDEIO::NetAccess::upload( saveFile, dest, const_cast( this ) ); } Imlib_kill_image( id, saveIm ); diff --git a/kuickshow/src/imdata.cpp b/kuickshow/src/imdata.cpp index a2e89283..e084e898 100644 --- a/kuickshow/src/imdata.cpp +++ b/kuickshow/src/imdata.cpp @@ -43,7 +43,7 @@ ImData::ImData() } -void ImData::load( KConfig *kc ) +void ImData::load( TDEConfig *kc ) { ImData def; @@ -68,7 +68,7 @@ void ImData::load( KConfig *kc ) } -void ImData::save( KConfig *kc ) +void ImData::save( TDEConfig *kc ) { kc->setGroup( "ImlibConfiguration" ); diff --git a/kuickshow/src/imdata.h b/kuickshow/src/imdata.h index c6dc6a5c..9ef5faa0 100644 --- a/kuickshow/src/imdata.h +++ b/kuickshow/src/imdata.h @@ -19,15 +19,15 @@ #ifndef IMBLIBCONFIG_H #define IMBLIBCONFIG_H -class KConfig; +class TDEConfig; class ImData { public: ImData(); ~ImData() {}; - void load( KConfig *kc ); - void save( KConfig *kc ); + void load( TDEConfig *kc ); + void save( TDEConfig *kc ); // new stuff.......... diff --git a/kuickshow/src/kuickdata.cpp b/kuickshow/src/kuickdata.cpp index d0c3a9dd..c7b5f203 100644 --- a/kuickshow/src/kuickdata.cpp +++ b/kuickshow/src/kuickdata.cpp @@ -70,7 +70,7 @@ KuickData::~KuickData() void KuickData::load() { - KConfig *kc = TDEGlobal::config(); + TDEConfig *kc = TDEGlobal::config(); KuickData def; @@ -134,7 +134,7 @@ void KuickData::load() void KuickData::save() { - KConfig *kc = TDEGlobal::config(); + TDEConfig *kc = TDEGlobal::config(); kc->setGroup( "GeneralConfiguration" ); kc->writeEntry( "FileFilter", fileFilter ); diff --git a/kuickshow/src/kuickdata.h b/kuickshow/src/kuickdata.h index e24d3bc4..939219b7 100644 --- a/kuickshow/src/kuickdata.h +++ b/kuickshow/src/kuickdata.h @@ -24,7 +24,7 @@ #include "imdata.h" -class KConfig; +class TDEConfig; // values are also used as combobox index defaultswidget.* enum Rotation { ROT_0=0, ROT_90=1, ROT_180=2, ROT_270=3 }; diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp index a48c27db..d0cff155 100644 --- a/kuickshow/src/kuickfile.cpp +++ b/kuickshow/src/kuickfile.cpp @@ -22,7 +22,7 @@ KuickFile::KuickFile(const KURL& url) if ( m_url.isLocalFile()) m_localFile = m_url.path(); else { - const KURL& mostLocal = KIO::NetAccess::mostLocalURL( m_url, 0L ); + const KURL& mostLocal = TDEIO::NetAccess::mostLocalURL( m_url, 0L ); if ( mostLocal.isValid() && mostLocal.isLocalFile() ) m_localFile = mostLocal.path(); } @@ -84,10 +84,10 @@ bool KuickFile::download() KURL destURL; destURL.setPath( tempFile.name() ); - m_job = KIO::file_copy( m_url, destURL, -1, true, false, false ); // handling progress ourselves + m_job = TDEIO::file_copy( m_url, destURL, -1, true, false, false ); // handling progress ourselves m_job->setAutoErrorHandlingEnabled( true ); - connect( m_job, TQT_SIGNAL( result( KIO::Job * )), TQT_SLOT( slotResult( KIO::Job * ) )); - connect( m_job, TQT_SIGNAL( percent( KIO::Job *, unsigned long )), TQT_SLOT( slotProgress( KIO::Job *, unsigned long ) )); + connect( m_job, TQT_SIGNAL( result( TDEIO::Job * )), TQT_SLOT( slotResult( TDEIO::Job * ) )); + connect( m_job, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long )), TQT_SLOT( slotProgress( TDEIO::Job *, unsigned long ) )); // TODO: generify background/foreground downloading? @@ -136,7 +136,7 @@ KuickFile::DownloadStatus KuickFile::waitForDownload( TQWidget *parent ) return OK; } -void KuickFile::slotResult( KIO::Job *job ) +void KuickFile::slotResult( TDEIO::Job *job ) { if (job != m_job) { // huh? return; @@ -147,15 +147,15 @@ void KuickFile::slotResult( KIO::Job *job ) if ( job->error() != 0 ) { m_currentProgress = 0; - if ( job->error() != KIO::ERR_USER_CANCELED ) + if ( job->error() != TDEIO::ERR_USER_CANCELED ) kdWarning() << "ERROR: KuickFile::slotResult: " << job->errorString() << endl; - TQString canceledFile = static_cast(job)->destURL().path(); + TQString canceledFile = static_cast(job)->destURL().path(); TQFile::remove( canceledFile ); m_progress->topLevelWidget()->hide(); } else { - m_localFile = static_cast(job)->destURL().path(); + m_localFile = static_cast(job)->destURL().path(); emit downloaded( this ); // before closing the progress dialog if ( m_progress ) { @@ -168,7 +168,7 @@ void KuickFile::slotResult( KIO::Job *job ) } } -void KuickFile::slotProgress( KIO::Job *job, unsigned long percent ) +void KuickFile::slotProgress( TDEIO::Job *job, unsigned long percent ) { if (job != m_job) { // huh? return; diff --git a/kuickshow/src/kuickfile.h b/kuickshow/src/kuickfile.h index 86d23da7..78901ca7 100644 --- a/kuickshow/src/kuickfile.h +++ b/kuickshow/src/kuickfile.h @@ -16,7 +16,7 @@ #include #include -namespace KIO { +namespace TDEIO { class Job; class FileCopyJob; } @@ -83,13 +83,13 @@ signals: void downloaded( KuickFile * ); private slots: - void slotResult( KIO::Job *job ); - void slotProgress( KIO::Job *job, unsigned long percent ); + void slotResult( TDEIO::Job *job ); + void slotProgress( TDEIO::Job *job, unsigned long percent ); private: KURL m_url; TQString m_localFile; - KIO::FileCopyJob *m_job; + TDEIO::FileCopyJob *m_job; KProgress *m_progress; int m_currentProgress; diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp index 0b83deae..1e6352fa 100644 --- a/kuickshow/src/kuickshow.cpp +++ b/kuickshow/src/kuickshow.cpp @@ -114,7 +114,7 @@ KuickShow::KuickShow( const char *name ) connect( m_slideTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( nextSlide() )); - KConfig *kc = TDEGlobal::config(); + TDEConfig *kc = TDEGlobal::config(); bool isDir = false; // true if we get a directory on the commandline @@ -166,7 +166,7 @@ KuickShow::KuickShow( const char *name ) KMimeType::Ptr mime = KMimeType::findByURL( url ); TQString name = mime->name(); if ( name == "application/octet-stream" ) // unknown -> stat() - name = KIO::NetAccess::mimetype( url, this ); + name = TDEIO::NetAccess::mimetype( url, this ); // text/* is a hack for bugs.kde.org-attached-images urls. // The real problem here is that NetAccess::mimetype does a HTTP HEAD, which doesn't @@ -374,7 +374,7 @@ void KuickShow::initGUI( const KURL& startDir ) fileWidget->setFocus(); - KConfig *kc = TDEGlobal::config(); + TDEConfig *kc = TDEGlobal::config(); kc->setGroup("SessionSettings"); bool oneWindow = kc->readBoolEntry("OpenImagesInActiveWindow", true ); oneWindowAction->setChecked( oneWindow ); @@ -569,7 +569,7 @@ bool KuickShow::showImage( const KFileItem *fi, // file->waitForDownload( this ); // TQString filename; -// KIO::NetAccess::download(fi->url(), filename, this); +// TDEIO::NetAccess::download(fi->url(), filename, this); if ( !safeViewer->showNextImage( fi->url() ) ) { m_viewer = safeViewer; @@ -856,7 +856,7 @@ void KuickShow::slotAdvanceImage( ImageWindow *view, int steps ) if ( FileWidget::isImage( item ) ) { // TQString filename; -// KIO::NetAccess::download(item->url(), filename, this); +// TDEIO::NetAccess::download(item->url(), filename, this); view->showNextImage( item->url() ); if (m_slideTimer->isActive() && kdata->slideDelay) m_slideTimer->start( kdata->slideDelay ); @@ -1019,7 +1019,7 @@ bool KuickShow::eventFilter( TQObject *o, TQEvent *e ) if ( FileWidget::isImage( item ) ) { // TQString filename; -// KIO::NetAccess::download(item->url(), filename, this); +// TDEIO::NetAccess::download(item->url(), filename, this); m_viewer->showNextImage( item->url() ); if ( kdata->preloadImage && item_next ) { // preload next image @@ -1143,7 +1143,7 @@ void KuickShow::about() } // ------ sessionmanagement - load / save current directory ----- -void KuickShow::readProperties( KConfig *kc ) +void KuickShow::readProperties( TDEConfig *kc ) { assert( fileWidget ); // from SM, we should always have initGUI on startup TQString dir = kc->readPathEntry( "CurrentDirectory" ); @@ -1173,7 +1173,7 @@ void KuickShow::readProperties( KConfig *kc ) show(); } -void KuickShow::saveProperties( KConfig *kc ) +void KuickShow::saveProperties( TDEConfig *kc ) { kc->writeEntry( "Browser visible", fileWidget && fileWidget->isVisible() ); if (fileWidget) @@ -1197,7 +1197,7 @@ void KuickShow::saveProperties( KConfig *kc ) void KuickShow::saveSettings() { - KConfig *kc = TDEGlobal::config(); + TDEConfig *kc = TDEGlobal::config(); kc->setGroup("SessionSettings"); if ( oneWindowAction ) diff --git a/kuickshow/src/kuickshow.h b/kuickshow/src/kuickshow.h index 45ee0a30..31874153 100644 --- a/kuickshow/src/kuickshow.h +++ b/kuickshow/src/kuickshow.h @@ -38,7 +38,7 @@ class ImData; class KuickConfigDialog; class KAccel; -class KConfig; +class TDEConfig; class KToggleAction; class AboutWidget; @@ -97,7 +97,7 @@ public: protected: - virtual void readProperties( KConfig * ); + virtual void readProperties( TDEConfig * ); void initImlibParams( ImData *, ImlibInitParams * ); void tryShowNextImage(); @@ -145,7 +145,7 @@ private: void initGUI( const KURL& startDir ); bool eventFilter( TQObject *, TQEvent * ); void initImlib(); - void saveProperties( KConfig * ); + void saveProperties( TDEConfig * ); void saveSettings(); bool haveBrowser() const; void delayedRepeatEvent( ImageWindow *, TQKeyEvent * ); -- cgit v1.2.3