summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:06:13 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:06:13 -0600
commitf10950a5b2fef43a5f3a99170682eea55fe9b80b (patch)
treeaaaec7f404be3c85dba99e083c63a46d4e29184d
parente9654e1a22ff355962fd97168f051336b814f4aa (diff)
downloadgwenview-f10950a5b2fef43a5f3a99170682eea55fe9b80b.tar.gz
gwenview-f10950a5b2fef43a5f3a99170682eea55fe9b80b.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
-rw-r--r--src/app/configdialog.cpp20
-rw-r--r--src/app/configdialog.h2
-rw-r--r--src/app/dirviewcontroller.h2
-rw-r--r--src/app/mainwindow.cpp20
-rw-r--r--src/app/mainwindow.h4
-rw-r--r--src/gvcore/cache.cpp6
-rw-r--r--src/gvcore/cache.h4
-rw-r--r--src/gvcore/document.cpp16
-rw-r--r--src/gvcore/document.h4
-rw-r--r--src/gvcore/documentloadedimpl.cpp2
-rw-r--r--src/gvcore/fileoperation.h6
-rw-r--r--src/gvcore/fileopobject.cpp36
-rw-r--r--src/gvcore/fileopobject.h6
-rw-r--r--src/gvcore/filethumbnailview.cpp2
-rw-r--r--src/gvcore/filethumbnailview.h2
-rw-r--r--src/gvcore/filethumbnailviewitem.cpp4
-rw-r--r--src/gvcore/fileviewcontroller.cpp2
-rw-r--r--src/gvcore/fileviewcontroller.h2
-rw-r--r--src/gvcore/imageloader.cpp28
-rw-r--r--src/gvcore/imageloader.h6
-rw-r--r--src/gvcore/mimetypeutils.cpp2
-rw-r--r--src/gvcore/slideshow.h2
-rw-r--r--src/gvcore/thumbnailloadjob.cpp20
-rw-r--r--src/gvcore/thumbnailloadjob.h6
-rw-r--r--src/gvcore/timeutils.cpp2
-rw-r--r--src/gvdirpart/gvdirpart.cpp2
-rw-r--r--src/gvimagepart/gvimagepart.cpp20
-rw-r--r--src/gvimagepart/gvimagepart.h4
28 files changed, 116 insertions, 116 deletions
diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp
index d2a442c..f482cc7 100644
--- a/src/app/configdialog.cpp
+++ b/src/app/configdialog.cpp
@@ -70,7 +70,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "configdialog.moc"
namespace Gwenview {
-typedef TQValueList<KConfigDialogManager*> ConfigManagerList;
+typedef TQValueList<TDEConfigDialogManager*> ConfigManagerList;
class ConfigDialogPrivate {
public:
@@ -122,23 +122,23 @@ ConfigDialog::ConfigDialog(TQWidget* parent, KIPI::PluginLoader* pluginLoader)
// Create dialog pages
d->mImageListPage = addConfigPage<ConfigImageListPage>(
this, i18n("Configure Image List"), i18n("Image List"), "view_icon");
- d->mManagers << new KConfigDialogManager(d->mImageListPage, FileViewConfig::self());
+ d->mManagers << new TDEConfigDialogManager(d->mImageListPage, FileViewConfig::self());
d->mImageViewPage = addConfigPage<ConfigImageViewPage>(
this, i18n("Configure Image View"), i18n("Image View"), "looknfeel");
- d->mManagers << new KConfigDialogManager(d->mImageViewPage, ImageViewConfig::self());
+ d->mManagers << new TDEConfigDialogManager(d->mImageViewPage, ImageViewConfig::self());
d->mFullScreenPage = addConfigPage<ConfigFullScreenPage>(
this, i18n("Configure Full Screen Mode"), i18n("Full Screen"), "window_fullscreen");
- d->mManagers << new KConfigDialogManager(d->mFullScreenPage, FullScreenConfig::self());
+ d->mManagers << new TDEConfigDialogManager(d->mFullScreenPage, FullScreenConfig::self());
d->mFileOperationsPage = addConfigPage<ConfigFileOperationsPage>(
this, i18n("Configure File Operations"), i18n("File Operations"), "folder");
- d->mManagers << new KConfigDialogManager(d->mFileOperationsPage, FileOperationConfig::self());
+ d->mManagers << new TDEConfigDialogManager(d->mFileOperationsPage, FileOperationConfig::self());
d->mSlideShowPage = addConfigPage<ConfigSlideshowPage>(
this, i18n("SlideShow"), i18n("SlideShow"), "slideshow_play");
- d->mManagers << new KConfigDialogManager(d->mSlideShowPage, SlideShowConfig::self());
+ d->mManagers << new TDEConfigDialogManager(d->mSlideShowPage, SlideShowConfig::self());
#ifdef GV_HAVE_KIPI
Q_ASSERT(pluginLoader);
@@ -152,7 +152,7 @@ ConfigDialog::ConfigDialog(TQWidget* parent, KIPI::PluginLoader* pluginLoader)
d->mMiscPage = addConfigPage<ConfigMiscPage>(
this, i18n("Miscellaneous Settings"), i18n("Misc"), "gear");
- d->mManagers << new KConfigDialogManager(d->mMiscPage, MiscConfig::self());
+ d->mManagers << new TDEConfigDialogManager(d->mMiscPage, MiscConfig::self());
// Read config, because the modified behavior might have changed
MiscConfig::self()->readConfig();
@@ -247,7 +247,7 @@ void ConfigDialog::calculateCacheSize() {
KURL url;
url.setPath(ThumbnailLoadJob::thumbnailBaseDir());
unsigned long size=KDirSize::dirSize(url);
- KMessageBox::information( this,i18n("Cache size is %1").arg(KIO::convertSize(size)) );
+ KMessageBox::information( this,i18n("Cache size is %1").arg(TDEIO::convertSize(size)) );
}
@@ -289,13 +289,13 @@ void ConfigDialog::emptyCache() {
KURL url;
url.setPath(dir);
- if (KIO::NetAccess::del(url, topLevelWidget()) ) {
+ if (TDEIO::NetAccess::del(url, topLevelWidget()) ) {
KMessageBox::information( this,i18n("Cache emptied.") );
}
}
-void ConfigDialog::onCacheEmptied(KIO::Job* job) {
+void ConfigDialog::onCacheEmptied(TDEIO::Job* job) {
if ( job->error() ) {
job->showErrorDialog(this);
return;
diff --git a/src/app/configdialog.h b/src/app/configdialog.h
index 5e35bcb..28b094d 100644
--- a/src/app/configdialog.h
+++ b/src/app/configdialog.h
@@ -53,7 +53,7 @@ private slots:
void updateOSDPreview();
void calculateCacheSize();
void emptyCache();
- void onCacheEmptied(KIO::Job*);
+ void onCacheEmptied(TDEIO::Job*);
private:
ConfigDialogPrivate* d;
diff --git a/src/app/dirviewcontroller.h b/src/app/dirviewcontroller.h
index 7dd31bd..1327b69 100644
--- a/src/app/dirviewcontroller.h
+++ b/src/app/dirviewcontroller.h
@@ -31,7 +31,7 @@ class TQWidget;
class KListView;
class KURL;
-namespace KIO {
+namespace TDEIO {
class Job;
}
diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index 485a946..75a9d42 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -143,17 +143,17 @@ static bool urlIsDirectory(TQWidget* parent, const KURL& url) {
if( url.filename( false ).isEmpty()) return true; // file:/somewhere/<nothing here>
// Do direct stat instead of using KIO if the file is local (faster)
if( url.isLocalFile()
- && !KIO::probably_slow_mounted( url.path())) {
+ && !TDEIO::probably_slow_mounted( url.path())) {
KDE_struct_stat buff;
if ( KDE_stat( TQFile::encodeName(url.path()), &buff ) == 0 ) {
return S_ISDIR( buff.st_mode );
}
}
- KIO::UDSEntry entry;
- if( KIO::NetAccess::stat( url, entry, parent)) {
- KIO::UDSEntry::ConstIterator it;
+ TDEIO::UDSEntry entry;
+ if( TDEIO::NetAccess::stat( url, entry, parent)) {
+ TDEIO::UDSEntry::ConstIterator it;
for(it=entry.begin();it!=entry.end();++it) {
- if ((*it).m_uds==KIO::UDS_FILE_TYPE) {
+ if ((*it).m_uds==TDEIO::UDS_FILE_TYPE) {
return S_ISDIR( (*it).m_long );
}
}
@@ -197,7 +197,7 @@ void MainWindow::setFullScreen(bool value) {
bool MainWindow::queryClose() {
mDocument->saveBeforeClosing();
- KConfig* config=TDEGlobal::config();
+ TDEConfig* config=TDEGlobal::config();
// Don't store dock layout if only the image dock is visible. This avoid
// saving layout when in "fullscreen" or "image only" mode.
@@ -211,7 +211,7 @@ bool MainWindow::queryClose() {
if (TQFile::exists(dir)) {
KURL url;
url.setPath(dir);
- KIO::NetAccess::del(url, this);
+ TDEIO::NetAccess::del(url, this);
}
}
@@ -223,11 +223,11 @@ bool MainWindow::queryClose() {
return true;
}
-void MainWindow::saveProperties( KConfig* cfg ) {
+void MainWindow::saveProperties( TDEConfig* cfg ) {
cfg->writeEntry( CONFIG_SESSION_URL, mFileViewController->url().url());
}
-void MainWindow::readProperties( KConfig* cfg ) {
+void MainWindow::readProperties( TDEConfig* cfg ) {
KURL url(cfg->readEntry(CONFIG_SESSION_URL));
openURL(url);
}
@@ -856,7 +856,7 @@ void MainWindow::updateImageActions() {
* actions are created in createObjectInteractions
*/
void MainWindow::createWidgets() {
- KConfig* config=TDEGlobal::config();
+ TDEConfig* config=TDEGlobal::config();
mCentralStack=new TQWidgetStack(this);
setCentralWidget(mCentralStack);
diff --git a/src/app/mainwindow.h b/src/app/mainwindow.h
index c38fbca..a2dc4a0 100644
--- a/src/app/mainwindow.h
+++ b/src/app/mainwindow.h
@@ -75,8 +75,8 @@ public slots:
protected:
bool queryClose();
- virtual void saveProperties( KConfig* );
- virtual void readProperties( KConfig* );
+ virtual void saveProperties( TDEConfig* );
+ virtual void readProperties( TDEConfig* );
private:
TQWidgetStack* mCentralStack;
diff --git a/src/gvcore/cache.cpp b/src/gvcore/cache.cpp
index d4dd3e2..7f074c2 100644
--- a/src/gvcore/cache.cpp
+++ b/src/gvcore/cache.cpp
@@ -55,7 +55,7 @@ struct ImageData : public KShared {
ImageData( const KURL& url, const TQDateTime& _timestamp )
: timestamp(_timestamp)
, age(0)
- , fast_url( url.isLocalFile() && !KIO::probably_slow_mounted( url.path()))
+ , fast_url( url.isLocalFile() && !TDEIO::probably_slow_mounted( url.path()))
, priority( false ) {
}
@@ -298,8 +298,8 @@ void Cache::checkMaxSize() {
}
}
-void Cache::readConfig(KConfig* config,const TQString& group) {
- KConfigGroupSaver saver( config, group );
+void Cache::readConfig(TDEConfig* config,const TQString& group) {
+ TDEConfigGroupSaver saver( config, group );
d->mMaxSize = config->readNumEntry( CONFIG_CACHE_MAXSIZE, d->mMaxSize );
checkMaxSize();
}
diff --git a/src/gvcore/cache.h b/src/gvcore/cache.h
index 7c5420f..40425d1 100644
--- a/src/gvcore/cache.h
+++ b/src/gvcore/cache.h
@@ -35,7 +35,7 @@ Copyright 2000-2004 Aurélien Gâteau
// Local
#include "imageframe.h"
#include "libgwenview_export.h"
-class KConfig;
+class TDEConfig;
namespace Gwenview {
class LIBGWENVIEW_EXPORT Cache : public TQObject {
@@ -54,7 +54,7 @@ public:
void setPriorityURL( const KURL& url, bool set );
void invalidate( const KURL& url );
void checkThumbnailSize( int size );
- void readConfig(KConfig*,const TQString& group);
+ void readConfig(TDEConfig*,const TQString& group);
void updateAge();
enum { DEFAULT_MAXSIZE = 16 * 1024 * 1024 }; // 16MiB
private:
diff --git a/src/gvcore/document.cpp b/src/gvcore/document.cpp
index f6db357..b7d3ca8 100644
--- a/src/gvcore/document.cpp
+++ b/src/gvcore/document.cpp
@@ -92,7 +92,7 @@ public:
TQString mMimeType;
TQCString mImageFormat;
DocumentImpl* mImpl;
- TQGuardedPtr<KIO::StatJob> mStatJob;
+ TQGuardedPtr<TDEIO::StatJob> mStatJob;
int mFileSize;
};
@@ -195,14 +195,14 @@ void Document::setURL(const KURL& paramURL) {
}
d->mURL = localURL; // this may be fixed after stat() is complete, but set at least something
- d->mStatJob = KIO::stat( localURL, !localURL.isLocalFile() );
+ d->mStatJob = TDEIO::stat( localURL, !localURL.isLocalFile() );
d->mStatJob->setWindow(TDEApplication::kApplication()->mainWidget());
- connect( d->mStatJob, TQT_SIGNAL( result (KIO::Job *) ),
- this, TQT_SLOT( slotStatResult (KIO::Job *) ) );
+ connect( d->mStatJob, TQT_SIGNAL( result (TDEIO::Job *) ),
+ this, TQT_SLOT( slotStatResult (TDEIO::Job *) ) );
}
-void Document::slotStatResult(KIO::Job* job) {
+void Document::slotStatResult(TDEIO::Job* job) {
LOG("");
Q_ASSERT(d->mStatJob==job);
if (d->mStatJob!=job) {
@@ -213,12 +213,12 @@ void Document::slotStatResult(KIO::Job* job) {
if (d->mStatJob->error()) return;
bool isDir=false;
- KIO::UDSEntry entry = d->mStatJob->statResult();
+ TDEIO::UDSEntry entry = d->mStatJob->statResult();
d->mURL=d->mStatJob->url();
- KIO::UDSEntry::ConstIterator it;
+ TDEIO::UDSEntry::ConstIterator it;
for(it=entry.begin();it!=entry.end();++it) {
- if ((*it).m_uds==KIO::UDS_FILE_TYPE) {
+ if ((*it).m_uds==TDEIO::UDS_FILE_TYPE) {
isDir=S_ISDIR( (*it).m_long );
break;
}
diff --git a/src/gvcore/document.h b/src/gvcore/document.h
index 3d27c70..ee95312 100644
--- a/src/gvcore/document.h
+++ b/src/gvcore/document.h
@@ -34,7 +34,7 @@ Copyright 2000-2006 Aurelien Gateau
#include "imageutils/orientation.h"
#include "mimetypeutils.h"
#include "libgwenview_export.h"
-namespace KIO { class Job; }
+namespace TDEIO { class Job; }
namespace Gwenview {
class DocumentPrivate;
@@ -157,7 +157,7 @@ signals:
void errorHappened(const TQString& message);
private slots:
- void slotStatResult(KIO::Job*);
+ void slotStatResult(TDEIO::Job*);
void slotFinished(bool success);
void slotLoading();
void slotLoaded();
diff --git a/src/gvcore/documentloadedimpl.cpp b/src/gvcore/documentloadedimpl.cpp
index 08eb24f..f3f7611 100644
--- a/src/gvcore/documentloadedimpl.cpp
+++ b/src/gvcore/documentloadedimpl.cpp
@@ -175,7 +175,7 @@ TQString DocumentLoadedImpl::save(const KURL& _url, const TQCString& format) con
return i18n("Could not write to %1.").arg(url.path());
}
} else {
- if (!KIO::NetAccess::upload(tmp.name(), url, TDEApplication::kApplication()->mainWidget() )) {
+ if (!TDEIO::NetAccess::upload(tmp.name(), url, TDEApplication::kApplication()->mainWidget() )) {
return i18n("Could not upload the file to %1.").arg(url.prettyURL());
}
}
diff --git a/src/gvcore/fileoperation.h b/src/gvcore/fileoperation.h
index 2faaef7..79f7495 100644
--- a/src/gvcore/fileoperation.h
+++ b/src/gvcore/fileoperation.h
@@ -67,16 +67,16 @@ public:
public slots:
void copy() {
- KIO::copy(mSrc, mDst, true);
+ TDEIO::copy(mSrc, mDst, true);
}
void move() {
- KIO::move(mSrc, mDst, true);
+ TDEIO::move(mSrc, mDst, true);
if (mWasMoved) *mWasMoved=true;
}
void link() {
- KIO::link(mSrc, mDst, true);
+ TDEIO::link(mSrc, mDst, true);
}
private:
diff --git a/src/gvcore/fileopobject.cpp b/src/gvcore/fileopobject.cpp
index 61ce9ee..4eb2df8 100644
--- a/src/gvcore/fileopobject.cpp
+++ b/src/gvcore/fileopobject.cpp
@@ -76,7 +76,7 @@ FileOpObject::FileOpObject(const KURL::List& list,TQWidget* parent)
{}
-void FileOpObject::slotResult(KIO::Job* job) {
+void FileOpObject::slotResult(TDEIO::Job* job) {
if (job->error()) {
job->showErrorDialog(mParent);
}
@@ -88,10 +88,10 @@ void FileOpObject::slotResult(KIO::Job* job) {
}
-void FileOpObject::polishJob(KIO::Job* job) {
+void FileOpObject::polishJob(TDEIO::Job* job) {
job->setWindow(mParent->topLevelWidget());
- connect( job, TQT_SIGNAL( result(KIO::Job*) ),
- this, TQT_SLOT( slotResult(KIO::Job*) ) );
+ connect( job, TQT_SIGNAL( result(TDEIO::Job*) ),
+ this, TQT_SLOT( slotResult(TDEIO::Job*) ) );
}
@@ -121,7 +121,7 @@ void FileOpCopyToObject::operator()() {
if (destURL.isEmpty()) return;
// Copy the file
- KIO::Job* job=KIO::copy(mURLList,destURL,true);
+ TDEIO::Job* job=TDEIO::copy(mURLList,destURL,true);
polishJob(job);
}
@@ -153,7 +153,7 @@ void FileOpLinkToObject::operator()() {
if (destURL.isEmpty()) return;
// Copy the file
- KIO::Job* job=KIO::link(mURLList,destURL,true);
+ TDEIO::Job* job=TDEIO::link(mURLList,destURL,true);
polishJob(job);
}
@@ -182,7 +182,7 @@ void FileOpMoveToObject::operator()() {
if (destURL.isEmpty()) return;
// Move the file
- KIO::Job* job=KIO::move(mURLList,destURL,true);
+ TDEIO::Job* job=TDEIO::move(mURLList,destURL,true);
polishJob(job);
}
@@ -199,24 +199,24 @@ void FileOpMakeDirObject::operator()() {
KURL newURL(mURLList.first());
newURL.addPath(newDir);
- KIO::Job* job=KIO::mkdir(newURL);
+ TDEIO::Job* job=TDEIO::mkdir(newURL);
polishJob(job);
}
-static KIO::Job* createTrashJob(KURL::List lst) {
+static TDEIO::Job* createTrashJob(KURL::List lst) {
KURL trashURL("trash:/");
// Go do it
if (lst.count()==1) {
- // If there's only one file, KIO::move will think we want to overwrite
+ // If there's only one file, TDEIO::move will think we want to overwrite
// the trash dir with the file to trash, so we add the file name
trashURL.addPath(lst.first().fileName());
}
- return KIO::move(lst, trashURL);
+ return TDEIO::move(lst, trashURL);
}
-static KIO::Job* createDeleteJob(KURL::List lst) {
- return KIO::del(lst, false, true);
+static TDEIO::Job* createDeleteJob(KURL::List lst) {
+ return TDEIO::del(lst, false, true);
}
@@ -233,7 +233,7 @@ void FileOpDelObject::operator()() {
}
- KIO::Job* job;
+ TDEIO::Job* job;
if (shouldDelete) {
job = createDeleteJob(mURLList);
} else {
@@ -264,7 +264,7 @@ void FileOpTrashObject::operator()() {
if (response!=KMessageBox::Continue) return;
}
- KIO::Job* job = createTrashJob(mURLList);
+ TDEIO::Job* job = createTrashJob(mURLList);
polishJob(job);
}
@@ -296,7 +296,7 @@ void FileOpRealDeleteObject::operator()() {
}
// Delete the file
- KIO::Job* job = createDeleteJob(mURLList);
+ TDEIO::Job* job = createDeleteJob(mURLList);
polishJob(job);
}
@@ -327,12 +327,12 @@ void FileOpRenameObject::operator()() {
// Rename the file
KURL destURL=srcURL;
destURL.setFileName(mNewFilename);
- KIO::Job* job=KIO::move(srcURL,destURL);
+ TDEIO::Job* job=TDEIO::move(srcURL,destURL);
polishJob(job);
}
-void FileOpRenameObject::slotResult(KIO::Job* job) {
+void FileOpRenameObject::slotResult(TDEIO::Job* job) {
if (job->error()) {
job->showErrorDialog(mParent);
}
diff --git a/src/gvcore/fileopobject.h b/src/gvcore/fileopobject.h
index c2e9236..74c0c77 100644
--- a/src/gvcore/fileopobject.h
+++ b/src/gvcore/fileopobject.h
@@ -54,13 +54,13 @@ signals:
void success();
protected slots:
- virtual void slotResult(KIO::Job*);
+ virtual void slotResult(TDEIO::Job*);
protected:
TQWidget* mParent;
KURL::List mURLList;
- void polishJob(KIO::Job*);
+ void polishJob(TDEIO::Job*);
};
@@ -140,7 +140,7 @@ signals:
void renamed(const TQString& newName);
protected slots:
- virtual void slotResult(KIO::Job*);
+ virtual void slotResult(TDEIO::Job*);
private:
TQString mNewFilename;
diff --git a/src/gvcore/filethumbnailview.cpp b/src/gvcore/filethumbnailview.cpp
index 57f436c..c9705df 100644
--- a/src/gvcore/filethumbnailview.cpp
+++ b/src/gvcore/filethumbnailview.cpp
@@ -376,7 +376,7 @@ void FileThumbnailView::doStartThumbnailUpdate(const KFileItemList* list) {
connect(d->mThumbnailLoadJob, TQT_SIGNAL(thumbnailLoaded(const KFileItem*, const TQPixmap&, const TQSize&)),
this, TQT_SLOT(setThumbnailPixmap(const KFileItem*,const TQPixmap&, const TQSize&)) );
- connect(d->mThumbnailLoadJob, TQT_SIGNAL(result(KIO::Job*)),
+ connect(d->mThumbnailLoadJob, TQT_SIGNAL(result(TDEIO::Job*)),
this, TQT_SLOT(slotUpdateEnded()) );
slotBusyLevelChanged( BusyLevelManager::instance()->busyLevel());
diff --git a/src/gvcore/filethumbnailview.h b/src/gvcore/filethumbnailview.h
index 222e993..5f6ab83 100644
--- a/src/gvcore/filethumbnailview.h
+++ b/src/gvcore/filethumbnailview.h
@@ -38,7 +38,7 @@ class TQIconViewItem;
class TQPopupMenu;
class TQShowEvent;
-class KConfig;
+class TDEConfig;
class KFileItem;
typedef TQPtrList<KFileItem> KFileItemList;
diff --git a/src/gvcore/filethumbnailviewitem.cpp b/src/gvcore/filethumbnailviewitem.cpp
index 7fe5c77..7c86bbe 100644
--- a/src/gvcore/filethumbnailviewitem.cpp
+++ b/src/gvcore/filethumbnailviewitem.cpp
@@ -217,7 +217,7 @@ void FileThumbnailViewItem::updateLines() {
mLines.append( new CroppedLine(this, txt) );
}
if (!isDir) {
- mLines.append( new CroppedLine(this, KIO::convertSize(mFileItem->size())) );
+ mLines.append( new CroppedLine(this, TDEIO::convertSize(mFileItem->size())) );
}
} else {
@@ -242,7 +242,7 @@ void FileThumbnailViewItem::updateLines() {
mLines.append( new CroppedLine(this, txt) );
}
if (!isDir && (details & FileThumbnailView::FILESIZE)) {
- mLines.append( new CroppedLine(this, KIO::convertSize(mFileItem->size())) );
+ mLines.append( new CroppedLine(this, TDEIO::convertSize(mFileItem->size())) );
}
}
diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp
index df99053..47f3d5c 100644
--- a/src/gvcore/fileviewcontroller.cpp
+++ b/src/gvcore/fileviewcontroller.cpp
@@ -99,7 +99,7 @@ public:
return url.isValid();
}
- virtual void handleError(KIO::Job* job) {
+ virtual void handleError(TDEIO::Job* job) {
mError = true;
if(mCheck) KDirLister::handleError( job );
};
diff --git a/src/gvcore/fileviewcontroller.h b/src/gvcore/fileviewcontroller.h
index 481fc47..38c914e 100644
--- a/src/gvcore/fileviewcontroller.h
+++ b/src/gvcore/fileviewcontroller.h
@@ -40,7 +40,7 @@ class TQPopupMenu;
class KAccel;
class KAction;
class KActionCollection;
-class KConfig;
+class TDEConfig;
class KListView;
class KRadioAction;
class KToggleAction;
diff --git a/src/gvcore/imageloader.cpp b/src/gvcore/imageloader.cpp
index ee43c5b..ffd06c2 100644
--- a/src/gvcore/imageloader.cpp
+++ b/src/gvcore/imageloader.cpp
@@ -326,22 +326,22 @@ void ImageLoader::startLoading() {
void ImageLoader::checkPendingStat() {
if( d->mSuspended || d->mGetState != GET_PENDING_STAT ) return;
- KIO::Job* job=KIO::stat( d->mURL, false );
+ TDEIO::Job* job=TDEIO::stat( d->mURL, false );
job->setWindow(TDEApplication::kApplication()->mainWidget());
- connect(job, TQT_SIGNAL(result(KIO::Job*)),
- this, TQT_SLOT(slotStatResult(KIO::Job*)) );
+ connect(job, TQT_SIGNAL(result(TDEIO::Job*)),
+ this, TQT_SLOT(slotStatResult(TDEIO::Job*)) );
d->mGetState = GET_STATING;
}
-void ImageLoader::slotStatResult(KIO::Job* job) {
+void ImageLoader::slotStatResult(TDEIO::Job* job) {
LOG("error code: " << job->error());
// Get modification time of the original file
- KIO::UDSEntry entry = static_cast<KIO::StatJob*>(job)->statResult();
- KIO::UDSEntry::ConstIterator it= entry.begin();
+ TDEIO::UDSEntry entry = static_cast<TDEIO::StatJob*>(job)->statResult();
+ TDEIO::UDSEntry::ConstIterator it= entry.begin();
TQDateTime urlTimestamp;
for (; it!=entry.end(); it++) {
- if ((*it).m_uds == KIO::UDS_MODIFICATION_TIME) {
+ if ((*it).m_uds == TDEIO::UDS_MODIFICATION_TIME) {
urlTimestamp.setTime_t( (*it).m_long );
break;
}
@@ -392,21 +392,21 @@ void ImageLoader::checkPendingGet() {
if( d->mSuspended || d->mGetState != GET_PENDING_GET ) return;
// Start loading the image
- KIO::Job* getJob=KIO::get( d->mURL, false, false);
+ TDEIO::Job* getJob=TDEIO::get( d->mURL, false, false);
getJob->setWindow(TDEApplication::kApplication()->mainWidget());
- connect(getJob, TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),
- this, TQT_SLOT(slotDataReceived(KIO::Job*, const TQByteArray&)) );
+ connect(getJob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+ this, TQT_SLOT(slotDataReceived(TDEIO::Job*, const TQByteArray&)) );
- connect(getJob, TQT_SIGNAL(result(KIO::Job*)),
- this, TQT_SLOT(slotGetResult(KIO::Job*)) );
+ connect(getJob, TQT_SIGNAL(result(TDEIO::Job*)),
+ this, TQT_SLOT(slotGetResult(TDEIO::Job*)) );
d->mTimeSinceLastUpdate.start();
d->mGetState = GET_GETTING;
}
-void ImageLoader::slotGetResult(KIO::Job* job) {
+void ImageLoader::slotGetResult(TDEIO::Job* job) {
LOG("error code: " << job->error());
if( job->error() != 0 ) {
// failed
@@ -449,7 +449,7 @@ static TQString mimeTypeFromFormat(const char* format) {
return mimeTypes[pos];
}
-void ImageLoader::slotDataReceived(KIO::Job* job, const TQByteArray& chunk) {
+void ImageLoader::slotDataReceived(TDEIO::Job* job, const TQByteArray& chunk) {
LOG2("size: " << chunk.size());
if (chunk.size()<=0) return;
diff --git a/src/gvcore/imageloader.h b/src/gvcore/imageloader.h
index ae9b7f8..b82f79b 100644
--- a/src/gvcore/imageloader.h
+++ b/src/gvcore/imageloader.h
@@ -83,9 +83,9 @@ signals:
void imageLoaded( bool ok );
private slots:
- void slotStatResult(KIO::Job*);
- void slotDataReceived(KIO::Job*, const TQByteArray& chunk);
- void slotGetResult(KIO::Job*);
+ void slotStatResult(TDEIO::Job*);
+ void slotDataReceived(TDEIO::Job*, const TQByteArray& chunk);
+ void slotGetResult(TDEIO::Job*);
void decodeChunk();
void slotDecoderThreadFailed();
void slotDecoderThreadSucceeded();
diff --git a/src/gvcore/mimetypeutils.cpp b/src/gvcore/mimetypeutils.cpp
index 1925b7d..814f599 100644
--- a/src/gvcore/mimetypeutils.cpp
+++ b/src/gvcore/mimetypeutils.cpp
@@ -77,7 +77,7 @@ Kind urlKind(const KURL& url) {
if (url.isLocalFile()) {
mimeType=KMimeType::findByURL(url)->name();
} else {
- mimeType=KIO::NetAccess::mimetype(url, TDEApplication::kApplication()->mainWidget());
+ mimeType=TDEIO::NetAccess::mimetype(url, TDEApplication::kApplication()->mainWidget());
}
return mimeTypeKind(mimeType);
}
diff --git a/src/gvcore/slideshow.h b/src/gvcore/slideshow.h
index d73566c..e6742b5 100644
--- a/src/gvcore/slideshow.h
+++ b/src/gvcore/slideshow.h
@@ -32,7 +32,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "libgwenview_export.h"
class TQTimer;
-class KConfig;
+class TDEConfig;
namespace Gwenview {
class Document;
diff --git a/src/gvcore/thumbnailloadjob.cpp b/src/gvcore/thumbnailloadjob.cpp
index d7650ba..4670709 100644
--- a/src/gvcore/thumbnailloadjob.cpp
+++ b/src/gvcore/thumbnailloadjob.cpp
@@ -372,7 +372,7 @@ void ThumbnailLoadJob::deleteImageThumbnail(const KURL& url) {
*/
ThumbnailLoadJob::ThumbnailLoadJob(const TQValueVector<const KFileItem*>* items, int size)
-: KIO::Job(false), mState( STATE_NEXTTHUMB ),
+: TDEIO::Job(false), mState( STATE_NEXTTHUMB ),
mCurrentVisibleIndex( -1 ), mFirstVisibleIndex( -1 ), mLastVisibleIndex( -1 ),
mThumbnailSize(size), mSuspended( false )
{
@@ -545,7 +545,7 @@ void ThumbnailLoadJob::determineNextIcon() {
// Do direct stat instead of using KIO if the file is local (faster)
if( mCurrentURL.isLocalFile()
- && !KIO::probably_slow_mounted( mCurrentURL.path())) {
+ && !TDEIO::probably_slow_mounted( mCurrentURL.path())) {
KDE_struct_stat buff;
if ( KDE_stat( TQFile::encodeName(mCurrentURL.path()), &buff ) == 0 ) {
mOriginalTime = buff.st_mtime;
@@ -553,15 +553,15 @@ void ThumbnailLoadJob::determineNextIcon() {
}
}
if( mOriginalTime == 0 ) { // KIO must be used
- KIO::Job* job = KIO::stat(mCurrentURL,false);
+ TDEIO::Job* job = TDEIO::stat(mCurrentURL,false);
job->setWindow(TDEApplication::kApplication()->mainWidget());
- LOG( "KIO::stat orig " << mCurrentURL.url() );
+ LOG( "TDEIO::stat orig " << mCurrentURL.url() );
addSubjob(job);
}
}
-void ThumbnailLoadJob::slotResult(KIO::Job * job) {
+void ThumbnailLoadJob::slotResult(TDEIO::Job * job) {
LOG(mState);
subjobs.remove(job);
Q_ASSERT(subjobs.isEmpty()); // We should have only one job at a time ...
@@ -581,11 +581,11 @@ void ThumbnailLoadJob::slotResult(KIO::Job * job) {
}
// Get modification time of the original file
- KIO::UDSEntry entry = static_cast<KIO::StatJob*>(job)->statResult();
- KIO::UDSEntry::ConstIterator it= entry.begin();
+ TDEIO::UDSEntry entry = static_cast<TDEIO::StatJob*>(job)->statResult();
+ TDEIO::UDSEntry::ConstIterator it= entry.begin();
mOriginalTime = 0;
for (; it!=entry.end(); ++it) {
- if ((*it).m_uds == KIO::UDS_MODIFICATION_TIME) {
+ if ((*it).m_uds == TDEIO::UDS_MODIFICATION_TIME) {
mOriginalTime = (time_t)((*it).m_long);
break;
}
@@ -700,7 +700,7 @@ void ThumbnailLoadJob::checkThumbnail() {
mTempPath=tmpFile.name();
KURL url;
url.setPath(mTempPath);
- KIO::Job* job=KIO::file_copy(mCurrentURL, url,-1,true,false,false);
+ TDEIO::Job* job=TDEIO::file_copy(mCurrentURL, url,-1,true,false,false);
job->setWindow(TDEApplication::kApplication()->mainWidget());
LOG("Download remote file " << mCurrentURL.prettyURL());
addSubjob(job);
@@ -710,7 +710,7 @@ void ThumbnailLoadJob::checkThumbnail() {
mState=STATE_PREVIEWJOB;
KFileItemList list;
list.append(mCurrentItem);
- KIO::Job* job=KIO::filePreview(list, mThumbnailSize);
+ TDEIO::Job* job=TDEIO::filePreview(list, mThumbnailSize);
job->setWindow(TDEApplication::kApplication()->mainWidget());
connect(job, TQT_SIGNAL(gotPreview(const KFileItem*, const TQPixmap&)),
this, TQT_SLOT(slotGotPreview(const KFileItem*, const TQPixmap&)) );
diff --git a/src/gvcore/thumbnailloadjob.h b/src/gvcore/thumbnailloadjob.h
index acc59d7..ab39085 100644
--- a/src/gvcore/thumbnailloadjob.h
+++ b/src/gvcore/thumbnailloadjob.h
@@ -39,7 +39,7 @@
#include "tsthread/tswaitcondition.h"
#include "libgwenview_export.h"
-class KConfig;
+class TDEConfig;
class KFileItem;
typedef TQPtrList<KFileItem> KFileItemList;
@@ -84,7 +84,7 @@ private:
/**
* A job that determines the thumbnails for the images in the current directory
*/
-class LIBGWENVIEW_EXPORT ThumbnailLoadJob : public KIO::Job {
+class LIBGWENVIEW_EXPORT ThumbnailLoadJob : public TDEIO::Job {
Q_OBJECT
public:
@@ -150,7 +150,7 @@ signals:
void thumbnailLoaded(const KFileItem* item, const TQPixmap&, const TQSize&);
private slots:
- void slotResult( KIO::Job *job );
+ void slotResult( TDEIO::Job *job );
void slotGotPreview(const KFileItem*, const TQPixmap&);
void checkThumbnail();
void thumbnailReady(const TQImage& im, const TQSize&);
diff --git a/src/gvcore/timeutils.cpp b/src/gvcore/timeutils.cpp
index eda6749..32f3a4f 100644
--- a/src/gvcore/timeutils.cpp
+++ b/src/gvcore/timeutils.cpp
@@ -39,7 +39,7 @@ time_t getTime(const KFileItem* item) {
return dt.toTime_t();
}
}
- return item->time(KIO::UDS_MODIFICATION_TIME);
+ return item->time(TDEIO::UDS_MODIFICATION_TIME);
}
TQString formatTime(time_t time) {
diff --git a/src/gvdirpart/gvdirpart.cpp b/src/gvdirpart/gvdirpart.cpp
index 14be72f..d525d33 100644
--- a/src/gvdirpart/gvdirpart.cpp
+++ b/src/gvdirpart/gvdirpart.cpp
@@ -133,7 +133,7 @@ GVDirPart::~GVDirPart() {
void GVDirPart::partActivateEvent(KParts::PartActivateEvent* event) {
if (event->activated()) {
- KConfig* config=new KConfig("gwenviewrc");
+ TDEConfig* config=new TDEConfig("gwenviewrc");
Cache::instance()->readConfig(config,CONFIG_CACHE_GROUP);
delete config;
}
diff --git a/src/gvimagepart/gvimagepart.cpp b/src/gvimagepart/gvimagepart.cpp
index 68b75eb..f36796c 100644
--- a/src/gvimagepart/gvimagepart.cpp
+++ b/src/gvimagepart/gvimagepart.cpp
@@ -129,7 +129,7 @@ GVImagePart::~GVImagePart() {
void GVImagePart::partActivateEvent(KParts::PartActivateEvent* event) {
if (event->activated()) {
- KConfig* config=new KConfig("gwenviewrc");
+ TDEConfig* config=new TDEConfig("gwenviewrc");
Cache::instance()->readConfig(config,CONFIG_CACHE_GROUP);
delete config;
}
@@ -329,7 +329,7 @@ void GVImagePart::saveAs() {
}
-void GVImagePart::showJobError(KIO::Job* job) {
+void GVImagePart::showJobError(TDEIO::Job* job) {
if (job->error() != 0) {
job->showErrorDialog(widget());
}
@@ -348,11 +348,11 @@ void GVImagePart::saveOriginalAs() {
TQByteArray data = Cache::instance()->file(srcURL);
if (data.size() == 0) {
- // We need to read the image again. Let KIO::copy do the work.
- KIO::Job* job = KIO::copy(srcURL, dstURL);
+ // We need to read the image again. Let TDEIO::copy do the work.
+ TDEIO::Job* job = TDEIO::copy(srcURL, dstURL);
job->setWindow(widget());
- connect(job, TQT_SIGNAL(result(KIO::Job*)),
- this, TQT_SLOT(showJobError(KIO::Job*)) );
+ connect(job, TQT_SIGNAL(result(TDEIO::Job*)),
+ this, TQT_SLOT(showJobError(TDEIO::Job*)) );
return;
}
@@ -386,14 +386,14 @@ DataUploader::DataUploader(TQWidget* dialogParent, const TQByteArray& data, cons
// Now upload it
KURL tmpURL;
tmpURL.setPath(mTempFile.name());
- KIO::Job* job = KIO::copy(tmpURL, dstURL);
+ TDEIO::Job* job = TDEIO::copy(tmpURL, dstURL);
job->setWindow(dialogParent);
- connect(job, TQT_SIGNAL(result(KIO::Job*)),
- this, TQT_SLOT(slotJobFinished(KIO::Job*)) );
+ connect(job, TQT_SIGNAL(result(TDEIO::Job*)),
+ this, TQT_SLOT(slotJobFinished(TDEIO::Job*)) );
}
-void DataUploader::slotJobFinished(KIO::Job* job) {
+void DataUploader::slotJobFinished(TDEIO::Job* job) {
if (job->error() != 0) {
job->showErrorDialog(mDialogParent);
}
diff --git a/src/gvimagepart/gvimagepart.h b/src/gvimagepart/gvimagepart.h
index 0bcc8d1..759f9a9 100644
--- a/src/gvimagepart/gvimagepart.h
+++ b/src/gvimagepart/gvimagepart.h
@@ -124,7 +124,7 @@ private slots:
void saveAs();
- void showJobError(KIO::Job* job);
+ void showJobError(TDEIO::Job* job);
private:
@@ -173,7 +173,7 @@ public:
DataUploader(TQWidget* dialogParent, const TQByteArray& data, const KURL& destURL);
private slots:
- void slotJobFinished(KIO::Job*);
+ void slotJobFinished(TDEIO::Job*);
private:
KTempFile mTempFile;