TDE
/
ksquirrel
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/ksquirrel
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent af42c31c98
commit 34e0917840
55 changed files with 257 additions and 257 deletions
Show Stats Download Patch File Download Diff File

2
ksquirrel/imageedit/sq_imageconvert.ui.h
Unescape View File

@ -181,7 +181,7 @@ void SQ_ImageConvert::slotOptions()
{ {
SQ_ImageEditOptions o(this); SQ_ImageEditOptions o(this);
// SQ_ImageEditOptions will write needed KConfig entries, if // SQ_ImageEditOptions will write needed TDEConfig entries, if
// exec() will return TQDialog::Accepted // exec() will return TQDialog::Accepted
o.setConfigPrefix("convert"); o.setConfigPrefix("convert");

4
ksquirrel/ksquirrel-libs-configurator/klc.ui
Unescape View File

@ -164,7 +164,7 @@
</includes> </includes>
<forwards> <forwards>
<forward>class KDirLister;</forward> <forward>class KDirLister;</forward>
<forward>namespace KIO { class Job; }</forward> <forward>namespace TDEIO { class Job; }</forward>
</forwards> </forwards>
<variables> <variables>
<variable access="private">KURL base, backup;</variable> <variable access="private">KURL base, backup;</variable>
@ -178,7 +178,7 @@
<slot access="private">slotCompleted( const KURL &amp; u )</slot> <slot access="private">slotCompleted( const KURL &amp; u )</slot>
<slot access="private">slotNewItems( const KFileItemList &amp; list )</slot> <slot access="private">slotNewItems( const KFileItemList &amp; list )</slot>
<slot access="private">slotDeleteItem( KFileItem * fi )</slot> <slot access="private">slotDeleteItem( KFileItem * fi )</slot>
<slot access="private">slotDelResult( KIO::Job * job )</slot> <slot access="private">slotDelResult( TDEIO::Job * job )</slot>
</Q_SLOTS> </Q_SLOTS>
<functions> <functions>
<function access="private" specifier="non virtual">init()</function> <function access="private" specifier="non virtual">init()</function>

8
ksquirrel/ksquirrel-libs-configurator/klc.ui.h
Unescape View File

@ -32,7 +32,7 @@ void KLC::init()
backupDir = backup.path(); backupDir = backup.path();
KIO::NetAccess::mkdir(backup, this); TDEIO::NetAccess::mkdir(backup, this);
TQTimer::singleShot(0, this, TQT_SLOT(slotLoad())); TQTimer::singleShot(0, this, TQT_SLOT(slotLoad()));
} }
@ -76,9 +76,9 @@ void KLC::moveCodecs(bool e2d)
++it; ++it;
} }
KIO::Job *job = KIO::move(list, e2d ? backup : base); TDEIO::Job *job = TDEIO::move(list, e2d ? backup : base);
connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotDelResult(KIO::Job *))); connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotDelResult(TDEIO::Job *)));
} }
void KLC::slotCompleted(const KURL &u) void KLC::slotCompleted(const KURL &u)
@ -139,7 +139,7 @@ void KLC::slotDeleteItem(KFileItem *fi)
} }
} }
void KLC::slotDelResult(KIO::Job *job) void KLC::slotDelResult(TDEIO::Job *job)
{ {
if(job && job->error()) if(job && job->error())
job->showErrorDialog(this); job->showErrorDialog(this);

66
ksquirrel/ksquirrel.cpp
Unescape View File

@ -140,7 +140,7 @@ KSquirrel::KSquirrel(TQWidget *parent, const char *name)
writeDefaultEntries(); writeDefaultEntries();
// create KConfig instance. // create TDEConfig instance.
// It will help us to read and write config entries // It will help us to read and write config entries
kconf = new SQ_Config(TQT_TQOBJECT(this)); kconf = new SQ_Config(TQT_TQOBJECT(this));
@ -964,7 +964,7 @@ void KSquirrel::initBookmarks()
// local directory (~/.trinity/share/config) // local directory (~/.trinity/share/config)
void KSquirrel::writeDefaultEntries() void KSquirrel::writeDefaultEntries()
{ {
KConfig conf("ksquirrelrc"); TDEConfig conf("ksquirrelrc");
if(!conf.hasGroup("External tools")) if(!conf.hasGroup("External tools"))
{ {
@ -1300,20 +1300,20 @@ void KSquirrel::preCreate()
url.setPath(SQ_HLOptions::instance()->param); url.setPath(SQ_HLOptions::instance()->param);
statStage = false; statStage = false;
KIO::StatJob *job = KIO::stat(url, false); TDEIO::StatJob *job = TDEIO::stat(url, false);
job->setSide(true); job->setSide(true);
job->setDetails(0); job->setDetails(0);
connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotStatResult(KIO::Job *))); connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotStatResult(TDEIO::Job *)));
} }
else else
continueLoading(); continueLoading();
} }
void KSquirrel::slotStatResult(KIO::Job *_job) void KSquirrel::slotStatResult(TDEIO::Job *_job)
{ {
if(_job) if(_job)
{ {
KIO::StatJob *job = static_cast<KIO::StatJob *>(_job); TDEIO::StatJob *job = static_cast<TDEIO::StatJob *>(_job);
if(job->error()) if(job->error())
{ {
@ -1327,13 +1327,13 @@ void KSquirrel::slotStatResult(KIO::Job *_job)
} }
// found local/remote URL // found local/remote URL
KIO::UDSEntry udsEntry = job->statResult(); TDEIO::UDSEntry udsEntry = job->statResult();
KIO::UDSEntry::ConstIterator itEnd = udsEntry.end(); TDEIO::UDSEntry::ConstIterator itEnd = udsEntry.end();
for(KIO::UDSEntry::ConstIterator it = udsEntry.begin(); it != itEnd;++it) for(TDEIO::UDSEntry::ConstIterator it = udsEntry.begin(); it != itEnd;++it)
{ {
// we need just file type... // we need just file type...
if((*it).m_uds == KIO::UDS_FILE_TYPE) if((*it).m_uds == TDEIO::UDS_FILE_TYPE)
{ {
if(S_ISDIR((mode_t)((*it).m_long))) if(S_ISDIR((mode_t)((*it).m_long)))
{ {
@ -1364,10 +1364,10 @@ void KSquirrel::slotStatResult(KIO::Job *_job)
// local url is not found. construct remote url and stat() it again // local url is not found. construct remote url and stat() it again
KURL url = KURL::fromPathOrURL(SQ_HLOptions::instance()->param); KURL url = KURL::fromPathOrURL(SQ_HLOptions::instance()->param);
statStage = true; statStage = true;
KIO::StatJob *job2 = KIO::stat(url, false); TDEIO::StatJob *job2 = TDEIO::stat(url, false);
job2->setSide(true); job2->setSide(true);
job2->setDetails(0); job2->setDetails(0);
connect(job2, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotStatResult(KIO::Job *))); connect(job2, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotStatResult(TDEIO::Job *)));
} }
else else
continueLoading(); continueLoading();
@ -1575,10 +1575,10 @@ bool KSquirrel::process(const TQCString &fun, const TQByteArray &data, TQCString
KURL url = KURL::fromPathOrURL(arg); KURL url = KURL::fromPathOrURL(arg);
KIO::StatJob *job = KIO::stat(url, false); TDEIO::StatJob *job = TDEIO::stat(url, false);
job->setSide(true); job->setSide(true);
job->setDetails(0); job->setDetails(0);
connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotDCOPStatResult(KIO::Job *))); connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotDCOPStatResult(TDEIO::Job *)));
replyType = "void"; replyType = "void";
@ -1589,11 +1589,11 @@ bool KSquirrel::process(const TQCString &fun, const TQByteArray &data, TQCString
return DCOPObject::process(fun, data, replyType, replyData); return DCOPObject::process(fun, data, replyType, replyData);
} }
void KSquirrel::slotDCOPStatResult(KIO::Job *_job) void KSquirrel::slotDCOPStatResult(TDEIO::Job *_job)
{ {
if(_job) if(_job)
{ {
KIO::StatJob *job = static_cast<KIO::StatJob *>(_job); TDEIO::StatJob *job = static_cast<TDEIO::StatJob *>(_job);
if(job->error()) if(job->error())
{ {
@ -1605,13 +1605,13 @@ void KSquirrel::slotDCOPStatResult(KIO::Job *_job)
bool isdir = false, setc = true; bool isdir = false, setc = true;
KURL dir = url; KURL dir = url;
KIO::UDSEntry udsEntry = job->statResult(); TDEIO::UDSEntry udsEntry = job->statResult();
KIO::UDSEntry::ConstIterator itEnd = udsEntry.end(); TDEIO::UDSEntry::ConstIterator itEnd = udsEntry.end();
for(KIO::UDSEntry::ConstIterator it = udsEntry.begin(); it != itEnd;++it) for(TDEIO::UDSEntry::ConstIterator it = udsEntry.begin(); it != itEnd;++it)
{ {
// we need just file type... // we need just file type...
if((*it).m_uds == KIO::UDS_FILE_TYPE) if((*it).m_uds == TDEIO::UDS_FILE_TYPE)
{ {
isdir = S_ISDIR((mode_t)((*it).m_long)); isdir = S_ISDIR((mode_t)((*it).m_long));
break; break;
@ -1813,13 +1813,13 @@ void KSquirrel::slotSlideShowStart()
// recursion ? // recursion ?
bool recurs = kconf->readBoolEntry("recurs", false); bool recurs = kconf->readBoolEntry("recurs", false);
listing = recurs ? KIO::listRecursive(slideShowDir, false, false) listing = recurs ? TDEIO::listRecursive(slideShowDir, false, false)
: KIO::listDir(slideShowDir, false, false); : TDEIO::listDir(slideShowDir, false, false);
connect(listing, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList &)), connect(listing, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)),
TQT_TQOBJECT(this), TQT_SLOT(slotSlideShowEntries(KIO::Job *, const KIO::UDSEntryList &))); TQT_TQOBJECT(this), TQT_SLOT(slotSlideShowEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)));
connect(listing, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotSlideShowJobResult(KIO::Job *))); connect(listing, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotSlideShowJobResult(TDEIO::Job *)));
timerShowListing->start(1000, true); timerShowListing->start(1000, true);
} }
@ -1833,15 +1833,15 @@ void KSquirrel::slotSlideShowListingKill()
listingDialog->hide(); listingDialog->hide();
} }
void KSquirrel::slotSlideShowEntries(KIO::Job *, const KIO::UDSEntryList &list) void KSquirrel::slotSlideShowEntries(TDEIO::Job *, const TDEIO::UDSEntryList &list)
{ {
KIO::UDSEntryListConstIterator itEnd = list.end(); TDEIO::UDSEntryListConstIterator itEnd = list.end();
KURL url = KURL::fromPathOrURL(slideShowDir); KURL url = KURL::fromPathOrURL(slideShowDir);
TQString sfile; TQString sfile;
// go through list of KIO::UDSEntrys // go through list of TDEIO::UDSEntrys
for(KIO::UDSEntryListConstIterator it = list.begin(); it != itEnd; ++it) for(TDEIO::UDSEntryListConstIterator it = list.begin(); it != itEnd; ++it)
{ {
KFileItem *file = new KFileItem(*it, url, true, true); KFileItem *file = new KFileItem(*it, url, true, true);
@ -1859,7 +1859,7 @@ void KSquirrel::slotSlideShowEntries(KIO::Job *, const KIO::UDSEntryList &list)
listingDialog->setFile(slideShowItems.count(), sfile); listingDialog->setFile(slideShowItems.count(), sfile);
} }
void KSquirrel::slotSlideShowJobResult(KIO::Job *job) void KSquirrel::slotSlideShowJobResult(TDEIO::Job *job)
{ {
listingDialog->setFile(0, TQString()); listingDialog->setFile(0, TQString());
listingDialog->hide(); listingDialog->hide();
@ -2167,11 +2167,11 @@ void KSquirrel::slotRename()
renameDestURL = renameSrcURL; renameDestURL = renameSrcURL;
renameDestURL.setFileName(mNewFilename); renameDestURL.setFileName(mNewFilename);
KIO::Job *job = KIO::move(renameSrcURL, renameDestURL); TDEIO::Job *job = TDEIO::move(renameSrcURL, renameDestURL);
connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_TQOBJECT(this), TQT_SLOT(slotRenameResult(KIO::Job*))); connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_TQOBJECT(this), TQT_SLOT(slotRenameResult(TDEIO::Job*)));
} }
void KSquirrel::slotRenameResult(KIO::Job *job) void KSquirrel::slotRenameResult(TDEIO::Job *job)
{ {
if(job->error()) if(job->error())
{ {

14
ksquirrel/ksquirrel.h
Unescape View File

@ -40,7 +40,7 @@ class TQVBox;
class TQTimer; class TQTimer;
class TQSplitter; class TQSplitter;
namespace KIO { class Job; } namespace TDEIO { class Job; }
class KMenuBar; class KMenuBar;
class KToolBar; class KToolBar;
@ -379,8 +379,8 @@ class KSquirrel : public KMainWindow, public DCOPObject
private slots: private slots:
void slotStatResult(KIO::Job *job); void slotStatResult(TDEIO::Job *job);
void slotDCOPStatResult(KIO::Job *job); void slotDCOPStatResult(TDEIO::Job *job);
void slotPreviewWidgetNext(); void slotPreviewWidgetNext();
void slotPreviewWidgetPrevious(); void slotPreviewWidgetPrevious();
@ -388,7 +388,7 @@ class KSquirrel : public KMainWindow, public DCOPObject
void slotSaveYourself(); void slotSaveYourself();
void slotRename(); void slotRename();
void slotRenameResult(KIO::Job *); void slotRenameResult(TDEIO::Job *);
void slotExtendedToggled(bool); void slotExtendedToggled(bool);
void slotTrayQuit(); void slotTrayQuit();
void slotClose(); void slotClose();
@ -413,12 +413,12 @@ class KSquirrel : public KMainWindow, public DCOPObject
/* /*
* Got new urls while listing directory for slideshow * Got new urls while listing directory for slideshow
*/ */
void slotSlideShowEntries(KIO::Job *, const KIO::UDSEntryList &); void slotSlideShowEntries(TDEIO::Job *, const TDEIO::UDSEntryList &);
/* /*
* Directory listed for slideshow * Directory listed for slideshow
*/ */
void slotSlideShowJobResult(KIO::Job *); void slotSlideShowJobResult(TDEIO::Job *);
void slotSlideShowListingKill(); void slotSlideShowListingKill();
@ -662,7 +662,7 @@ class KSquirrel : public KMainWindow, public DCOPObject
*/ */
bool slideShowPaused; bool slideShowPaused;
KIO::Job *listing; TDEIO::Job *listing;
SQ_SlideShowListing *listingDialog; SQ_SlideShowListing *listingDialog;

2
ksquirrel/ksquirrelpart/sq_config.cpp
Unescape View File

@ -27,7 +27,7 @@ SQ_Config::SQ_Config(TQObject *parent) : TQObject(parent)
{ {
m_instance = this; m_instance = this;
kconf = new KConfig("ksquirrelrc"); kconf = new TDEConfig("ksquirrelrc");
} }
SQ_Config::~SQ_Config() SQ_Config::~SQ_Config()

4
ksquirrel/ksquirrelpart/sq_config.h
Unescape View File

@ -21,7 +21,7 @@
#include <tqobject.h> #include <tqobject.h>
#include <kconfig.h> #include <kconfig.h>
class KConfig; class TDEConfig;
/* /*
* Class for reading/writing config file * Class for reading/writing config file
@ -61,7 +61,7 @@ class SQ_Config : public TQObject
void writeEntry( const TQString& pKey, const TQValueList<int>& rValue, bool bPersistent = true, bool bGlobal = false, bool bNLS = false ); void writeEntry( const TQString& pKey, const TQValueList<int>& rValue, bool bPersistent = true, bool bGlobal = false, bool bNLS = false );
private: private:
KConfig *kconf; TDEConfig *kconf;
static SQ_Config *m_instance; static SQ_Config *m_instance;
}; };

14
ksquirrel/ksquirrelpart/sq_downloader.cpp
Unescape View File

@ -60,17 +60,17 @@ void SQ_Downloader::start(KFileItem *fi)
nomime = true; nomime = true;
#endif #endif
job = KIO::get(mURL, false, false); job = TDEIO::get(mURL, false, false);
clean(); clean();
continueDownload = false; continueDownload = false;
connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &))); connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotDataResult(KIO::Job *))); connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotDataResult(TDEIO::Job *)));
} }
void SQ_Downloader::slotData(KIO::Job *job, const TQByteArray &ba) void SQ_Downloader::slotData(TDEIO::Job *job, const TQByteArray &ba)
{ {
size += ba.size(); size += ba.size();
@ -106,17 +106,17 @@ void SQ_Downloader::slotData(KIO::Job *job, const TQByteArray &ba)
} }
} }
void SQ_Downloader::slotDataResult(KIO::Job *cpjob) void SQ_Downloader::slotDataResult(TDEIO::Job *cpjob)
{ {
job = 0; job = 0;
// job error // job error
if(cpjob->error() && cpjob->error() != KIO::ERR_USER_CANCELED) if(cpjob->error() && cpjob->error() != TDEIO::ERR_USER_CANCELED)
{ {
m_error = true; m_error = true;
emit result(mEmptyURL); emit result(mEmptyURL);
} }
else if(cpjob->error() == KIO::ERR_USER_CANCELED) // not supported image/archive type - else if(cpjob->error() == TDEIO::ERR_USER_CANCELED) // not supported image/archive type -
// emit empty url without errors // emit empty url without errors
{ {
emit result(mEmptyURL); emit result(mEmptyURL);

10
ksquirrel/ksquirrelpart/sq_downloader.h
Unescape View File

@ -26,7 +26,7 @@
class KFileItem; class KFileItem;
class KTempFile; class KTempFile;
namespace KIO { class Job; } namespace TDEIO { class Job; }
class SQ_Downloader : public TQObject class SQ_Downloader : public TQObject
{ {
@ -50,14 +50,14 @@ class SQ_Downloader : public TQObject
void percents(int); void percents(int);
private slots: private slots:
void slotData(KIO::Job *job, const TQByteArray &data); void slotData(TDEIO::Job *job, const TQByteArray &data);
void slotDataResult(KIO::Job *); void slotDataResult(TDEIO::Job *);
private: private:
KIO::Job *job; TDEIO::Job *job;
KURL mEmptyURL, mURL; KURL mEmptyURL, mURL;
KTempFile *tmp; KTempFile *tmp;
KIO::filesize_t totalSize, size; TDEIO::filesize_t totalSize, size;
bool continueDownload; bool continueDownload;
bool nomime; bool nomime;
bool m_error, m_lightmode; bool m_error, m_lightmode;

4
ksquirrel/ksquirrelpart/sq_glwidget.cpp
Unescape View File

@ -1515,7 +1515,7 @@ void SQ_GLWidget::decode()
{ {
KMessageBox::error(this, KMessageBox::error(this,
i18n("Memory allocation failed for %1 of memory") i18n("Memory allocation failed for %1 of memory")
.arg(KIO::convertSize(pp.realw * pp.realh * sizeof(RGBA)))); .arg(TDEIO::convertSize(pp.realw * pp.realh * sizeof(RGBA))));
decodeFailedOn0(SQE_R_NOMEMORY); decodeFailedOn0(SQE_R_NOMEMORY);
return; return;
@ -1997,7 +1997,7 @@ void SQ_GLWidget::setDownloadPercents(int p)
percentsLabel->hide(); percentsLabel->hide();
else else
{ {
percentsLabel->setText(i18n("Downloading...") + ' ' + KIO::convertSize(p)); percentsLabel->setText(i18n("Downloading...") + ' ' + TDEIO::convertSize(p));
percentsLabel->adjustSize(); percentsLabel->adjustSize();
percentsLabel->show(); percentsLabel->show();
} }

6
ksquirrel/ksquirrelpart/sq_glwidget.h
Unescape View File

@ -55,7 +55,7 @@ class KPopupMenu;
class KRadioAction; class KRadioAction;
class KTempFile; class KTempFile;
namespace KIO { class Job; } namespace TDEIO { class Job; }
class TQTimer; class TQTimer;
class TQPopupMenu; class TQPopupMenu;
@ -475,7 +475,7 @@ class SQ_GLWidget : public TQGLWidget
void slotChangeTab(int); void slotChangeTab(int);
void slotCloseRequest(int); void slotCloseRequest(int);
void slotCopyJobResult(KIO::Job *job); void slotCopyJobResult(TDEIO::Job *job);
/* /*
* Slots for toolbar's actions: * Slots for toolbar's actions:
@ -516,7 +516,7 @@ class SQ_GLWidget : public TQGLWidget
void slotBCG(SQ_ImageBCGOptions *); void slotBCG(SQ_ImageBCGOptions *);
void slotFilter(SQ_ImageFilterOptions *fltopt); void slotFilter(SQ_ImageFilterOptions *fltopt);
void slotCopyResult(KIO::Job *); void slotCopyResult(TDEIO::Job *);
private: private:
KAction *pASelectionClear; KAction *pASelectionClear;

32
ksquirrel/ksquirrelpart/sq_glwidget_stuff.cpp
Unescape View File

@ -220,7 +220,7 @@ void SQ_GLWidget::slotProperties()
stopAnimation(); stopAnimation();
const int real_size = tab->finfo.image[tab->current].w * tab->finfo.image[tab->current].h * sizeof(RGBA); const int real_size = tab->finfo.image[tab->current].w * tab->finfo.image[tab->current].h * sizeof(RGBA);
TQString sz = KIO::convertSize(real_size); TQString sz = TDEIO::convertSize(real_size);
TQStringList list; TQStringList list;
TQValueVector<TQPair<TQString,TQString> > meta; TQValueVector<TQPair<TQString,TQString> > meta;
@ -603,13 +603,13 @@ void SQ_GLWidget::saveAs()
if(!url.isLocalFile()) if(!url.isLocalFile())
{ {
// src dst perm overwrite resume progress // src dst perm overwrite resume progress
KIO::Job *j = KIO::file_copy(path, url, -1, true, false, false); TDEIO::Job *j = TDEIO::file_copy(path, url, -1, true, false, false);
connect(j, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyResult(KIO::Job *))); connect(j, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyResult(TDEIO::Job *)));
} }
} }
void SQ_GLWidget::slotCopyResult(KIO::Job *job) void SQ_GLWidget::slotCopyResult(TDEIO::Job *job)
{ {
if(job->error()) if(job->error())
{ {
@ -627,8 +627,8 @@ void SQ_GLWidget::slotCopyResult(KIO::Job *job)
if(result == TQDialog::Rejected || d.selectedURL().isEmpty()) if(result == TQDialog::Rejected || d.selectedURL().isEmpty())
return; return;
KIO::Job *j = KIO::file_copy(tmp->name(), d.selectedURL(), -1, true, false, false); TDEIO::Job *j = TDEIO::file_copy(tmp->name(), d.selectedURL(), -1, true, false, false);
connect(j, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyResult(KIO::Job *))); connect(j, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyResult(TDEIO::Job *)));
} }
} }
} }
@ -1061,27 +1061,27 @@ void SQ_GLWidget::slotAccelActivated()
return; return;
lastCopy = url; lastCopy = url;
KIO::Job *job; TDEIO::Job *job;
if(!ks.compare(TQt::Key_F5)) if(!ks.compare(TQt::Key_F5))
job = KIO::copy(tab->m_original, url); job = TDEIO::copy(tab->m_original, url);
else else
job = KIO::move(tab->m_original, url); job = TDEIO::move(tab->m_original, url);
job->setWindow(this); job->setWindow(this);
connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyJobResult(KIO::Job *))); connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyJobResult(TDEIO::Job *)));
} }
else if(!ks.compare(TQt::Key_F7) || !ks.compare(TQt::Key_F8)) else if(!ks.compare(TQt::Key_F7) || !ks.compare(TQt::Key_F8))
{ {
KIO::Job *job; TDEIO::Job *job;
if(!ks.compare(TQt::Key_F6)) if(!ks.compare(TQt::Key_F6))
job = KIO::copy(tab->m_original, lastCopy); job = TDEIO::copy(tab->m_original, lastCopy);
else else
job = KIO::move(tab->m_original, lastCopy); job = TDEIO::move(tab->m_original, lastCopy);
job->setWindow(this); job->setWindow(this);
connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyJobResult(KIO::Job *))); connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyJobResult(TDEIO::Job *)));
} }
else if(!ks.compare(TQt::Key_F9)) copyURL(); else if(!ks.compare(TQt::Key_F9)) copyURL();
else if(!ks.compare(TQt::Key_Slash)) slotShowHelp(); else if(!ks.compare(TQt::Key_Slash)) slotShowHelp();
@ -1143,7 +1143,7 @@ void SQ_GLWidget::zoom(GLfloat val)
matrix_zoom(val); matrix_zoom(val);
} }
void SQ_GLWidget::slotCopyJobResult(KIO::Job *job) void SQ_GLWidget::slotCopyJobResult(TDEIO::Job *job)
{ {
if(job->error()) if(job->error())
job->showErrorDialog(this); job->showErrorDialog(this);
@ -1224,7 +1224,7 @@ void SQ_GLWidget::crop()
{ {
KMessageBox::error(this, KMessageBox::error(this,
i18n("Memory allocation failed for %1 of memory") i18n("Memory allocation failed for %1 of memory")
.arg(KIO::convertSize(pp.realw * pp.realh * sizeof(RGBA)))); .arg(TDEIO::convertSize(pp.realw * pp.realh * sizeof(RGBA))));
return; return;
} }

4
ksquirrel/ksquirrelpart/sq_imageproperties.ui
Unescape View File

@ -936,7 +936,7 @@
<forwards> <forwards>
<forward>class KPopupMenu;</forward> <forward>class KPopupMenu;</forward>
<forward>class KAction;</forward> <forward>class KAction;</forward>
<forward>namespace KIO { class Job; }</forward> <forward>namespace TDEIO { class Job; }</forward>
</forwards> </forwards>
<variables> <variables>
<variable access="private">KURL url;</variable> <variable access="private">KURL url;</variable>
@ -954,7 +954,7 @@
<slot access="private">slotCopyAll()</slot> <slot access="private">slotCopyAll()</slot>
<slot access="private">slotCopyEntry()</slot> <slot access="private">slotCopyEntry()</slot>
<slot access="private" specifier="non virtual">slotModeClicked( int id )</slot> <slot access="private" specifier="non virtual">slotModeClicked( int id )</slot>
<slot access="private">slotStatResult( KIO::Job * job )</slot> <slot access="private">slotStatResult( TDEIO::Job * job )</slot>
</Q_SLOTS> </Q_SLOTS>
<functions> <functions>
<function access="private" specifier="non virtual">init()</function> <function access="private" specifier="non virtual">init()</function>

16
ksquirrel/ksquirrelpart/sq_imageproperties.ui.h
Unescape View File

@ -84,8 +84,8 @@ void SQ_ImageProperties::setURL(const KURL &_url)
void SQ_ImageProperties::setFileParams() void SQ_ImageProperties::setFileParams()
{ {
KIO::Job *stjob = KIO::stat(url, false); TDEIO::Job *stjob = TDEIO::stat(url, false);
connect(stjob, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotStatResult(KIO::Job *))); connect(stjob, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotStatResult(TDEIO::Job *)));
#ifdef SQ_HAVE_KEXIF #ifdef SQ_HAVE_KEXIF
SQ_Config::instance()->setGroup("GL view"); SQ_Config::instance()->setGroup("GL view");
@ -230,11 +230,11 @@ void SQ_ImageProperties::slotModeClicked(int id)
#endif #endif
} }
void SQ_ImageProperties::slotStatResult(KIO::Job *job) void SQ_ImageProperties::slotStatResult(TDEIO::Job *job)
{ {
if(!job->error()) if(!job->error())
{ {
KIO::UDSEntry entry = static_cast<KIO::StatJob*>(job)->statResult(); TDEIO::UDSEntry entry = static_cast<TDEIO::StatJob*>(job)->statResult();
KFileItem fi(entry, url); KFileItem fi(entry, url);
KURL t = url; KURL t = url;
@ -242,17 +242,17 @@ void SQ_ImageProperties::slotStatResult(KIO::Job *job)
lineDirectory->setText(t.isLocalFile() ? t.path() : t.prettyURL()); lineDirectory->setText(t.isLocalFile() ? t.path() : t.prettyURL());
lineFile->setText(fi.name()); lineFile->setText(fi.name());
textSize->setText(KIO::convertSize(fi.size())); textSize->setText(TDEIO::convertSize(fi.size()));
textOwner->setText(TQString("%1").arg(fi.user())); textOwner->setText(TQString("%1").arg(fi.user()));
textGroup->setText(TQString("%1").arg(fi.group())); textGroup->setText(TQString("%1").arg(fi.group()));
textPermissions->setText(fi.permissionsString()); textPermissions->setText(fi.permissionsString());
TQDateTime abs; TQDateTime abs;
abs.setTime_t(fi.time(KIO::UDS_CREATION_TIME)); abs.setTime_t(fi.time(TDEIO::UDS_CREATION_TIME));
textCreated->setText(abs.toString("dd/MM/yyyy hh:mm:ss")); textCreated->setText(abs.toString("dd/MM/yyyy hh:mm:ss"));
abs.setTime_t(fi.time(KIO::UDS_ACCESS_TIME)); abs.setTime_t(fi.time(TDEIO::UDS_ACCESS_TIME));
textLastRead->setText(abs.toString("dd/MM/yyyy hh:mm:ss")); textLastRead->setText(abs.toString("dd/MM/yyyy hh:mm:ss"));
abs.setTime_t(fi.time(KIO::UDS_MODIFICATION_TIME)); abs.setTime_t(fi.time(TDEIO::UDS_MODIFICATION_TIME));
textLastMod->setText(abs.toString("dd/MM/yyyy hh:mm:ss")); textLastMod->setText(abs.toString("dd/MM/yyyy hh:mm:ss"));
} }
} }

2
ksquirrel/ksquirrelpart/sq_libraryhandler.cpp
Unescape View File

@ -53,7 +53,7 @@ SQ_LibraryHandler::SQ_LibraryHandler(TQObject *parent)
kdDebug() << "+SQ_LibraryHandler" << endl; kdDebug() << "+SQ_LibraryHandler" << endl;
kconf = new KConfig("ksquirrel-codec-settings"); kconf = new TDEConfig("ksquirrel-codec-settings");
load(); load();
} }

4
ksquirrel/ksquirrelpart/sq_libraryhandler.h
Unescape View File

@ -26,7 +26,7 @@
class TQStringList; class TQStringList;
class KConfig; class TDEConfig;
class KURL; class KURL;
/* /*
@ -120,7 +120,7 @@ class SQ_LibraryHandler : public TQObject, public TQValueVector<SQ_LIBRARY>
void readSettings(SQ_LIBRARY *lib); void readSettings(SQ_LIBRARY *lib);
private: private:
KConfig *kconf; TDEConfig *kconf;
static SQ_LibraryHandler *m_instance; static SQ_LibraryHandler *m_instance;
}; };

2
ksquirrel/main.cpp
Unescape View File

@ -155,7 +155,7 @@ int main(int argc, char *argv[])
SQ_SplashScreen *splash = 0; SQ_SplashScreen *splash = 0;
// should we show a splash screen ? // should we show a splash screen ?
KConfig *config = new KConfig("ksquirrelrc"); TDEConfig *config = new TDEConfig("ksquirrelrc");
config->setGroup("Main"); config->setGroup("Main");
if(config->readBoolEntry("splash", true)) if(config->readBoolEntry("splash", true))

6
ksquirrel/sidebar/sq_categoriesview.cpp
Unescape View File

@ -231,7 +231,7 @@ void SQ_CategoriesBox::slotNewCategory()
if(ok) if(ok)
{ {
lastdir = tmp; lastdir = tmp;
KIO::mkdir(cur->path() + TQDir::separator() + lastdir); TDEIO::mkdir(cur->path() + TQDir::separator() + lastdir);
} }
} }
@ -248,7 +248,7 @@ void SQ_CategoriesBox::slotDropped(TQDropEvent *e, TQListViewItem *parent, TQLis
TQString path = cur->path(); TQString path = cur->path();
if(list.first().path().startsWith(view->dir()->root())) if(list.first().path().startsWith(view->dir()->root()))
KIO::move(list, cur->url()); TDEIO::move(list, cur->url());
else else
{ {
KURL::List::iterator itEnd = list.end(); KURL::List::iterator itEnd = list.end();
@ -292,7 +292,7 @@ void SQ_CategoriesBox::slotDeleteItem()
cur = 0; cur = 0;
// physically remove file from storage // physically remove file from storage
KIO::del(tmp, false, false); TDEIO::del(tmp, false, false);
} }
void SQ_CategoriesBox::slotItemProperties() void SQ_CategoriesBox::slotItemProperties()

4
ksquirrel/sidebar/sq_categorybrowsermenu.cpp
Unescape View File

@ -117,7 +117,7 @@ void SQ_CategoryBrowserMenu::initialize()
initIconMap(); initIconMap();
// read configuration // read configuration
KConfig *c = TDEGlobal::config(); TDEConfig *c = TDEGlobal::config();
c->setGroup("menus"); c->setGroup("menus");
_showhidden = c->readBoolEntry("ShowHiddenFiles", false); _showhidden = c->readBoolEntry("ShowHiddenFiles", false);
_maxentries = c->readNumEntry("MaxEntries2", 30); _maxentries = c->readNumEntry("MaxEntries2", 30);
@ -235,7 +235,7 @@ void SQ_CategoryBrowserMenu::initialize()
else if(fi->isFile()) else if(fi->isFile())
{ {
TQString name = fi->fileName(); TQString name = fi->fileName();
TQString title = KIO::decodeFileName(name); TQString title = TDEIO::decodeFileName(name);
// ignore .directory and .order files // ignore .directory and .order files
if (name == ".directory" || name == ".order") continue; if (name == ".directory" || name == ".order") continue;

10
ksquirrel/sidebar/sq_directorybasket.cpp
Unescape View File

@ -100,7 +100,7 @@ void SQ_DBMenu::slotDirectoryRename()
} }
} }
void SQ_DBMenu::slotDirectoryResult(KIO::Job *job) void SQ_DBMenu::slotDirectoryResult(TDEIO::Job *job)
{ {
if(job && job->error()) if(job && job->error())
job->showErrorDialog(KSquirrel::app()); job->showErrorDialog(KSquirrel::app());
@ -110,9 +110,9 @@ void SQ_DBMenu::slotDirectoryDelete()
{ {
if(item) if(item)
{ {
KIO::Job *job = KIO::del(item->KFileTreeViewItem::url()); TDEIO::Job *job = TDEIO::del(item->KFileTreeViewItem::url());
connect(job, TQT_SIGNAL(result(KIO::Job*)), TQT_TQOBJECT(this), TQT_SLOT(slotDirectoryResult(KIO::Job *))); connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_TQOBJECT(this), TQT_SLOT(slotDirectoryResult(TDEIO::Job *)));
} }
} }
@ -343,14 +343,14 @@ void SQ_DirectoryBasket::slotDropped(TQDropEvent *e, TQListViewItem *_parent, TQ
{ {
KURL::List::iterator itEnd = list.end(); KURL::List::iterator itEnd = list.end();
KFileItemList flist; KFileItemList flist;
KIO::UDSEntry entry; TDEIO::UDSEntry entry;
progressAdd->setTotalSteps(list.count()); progressAdd->setTotalSteps(list.count());
timerAdd->start(1000, true); timerAdd->start(1000, true);
for(KURL::List::iterator it = list.begin();it != itEnd;++it) for(KURL::List::iterator it = list.begin();it != itEnd;++it)
{ {
if(KIO::NetAccess::stat(*it, entry, KSquirrel::app())) if(TDEIO::NetAccess::stat(*it, entry, KSquirrel::app()))
flist.append(new KFileItem(entry, *it)); flist.append(new KFileItem(entry, *it));
progressAdd->advance(1); progressAdd->advance(1);

4
ksquirrel/sidebar/sq_directorybasket.h
Unescape View File

@ -27,7 +27,7 @@ class TQTimer;
class KProgress; class KProgress;
namespace KIO { class Job; } namespace TDEIO { class Job; }
class SQ_DirectoryItem; class SQ_DirectoryItem;
class SQ_Dir; class SQ_Dir;
@ -49,7 +49,7 @@ class SQ_DBMenu : public SQ_TreeViewMenu
void slotChangeIcon(); void slotChangeIcon();
void slotDirectoryRename(); void slotDirectoryRename();
void slotDirectoryDelete(); void slotDirectoryDelete();
void slotDirectoryResult(KIO::Job *job); void slotDirectoryResult(TDEIO::Job *job);
private: private:
SQ_DirectoryItem *item; SQ_DirectoryItem *item;

4
ksquirrel/sidebar/sq_imagebasket.cpp
Unescape View File

@ -219,13 +219,13 @@ void SQ_ImageBasket::slotSync()
{ {
KFileItem *item = 0; KFileItem *item = 0;
KURL path; KURL path;
KIO::UDSEntry entry; TDEIO::UDSEntry entry;
for((item = fileView->firstFileItem()); item; item = fileView->nextItem(item)) for((item = fileView->firstFileItem()); item; item = fileView->nextItem(item))
{ {
path = SQ_StorageFile::readStorageFile(item->url().path()); path = SQ_StorageFile::readStorageFile(item->url().path());
if(!KIO::NetAccess::stat(path, entry, KSquirrel::app())) if(!TDEIO::NetAccess::stat(path, entry, KSquirrel::app()))
TQFile::remove(item->url().path()); TQFile::remove(item->url().path());
} }
} }

2
ksquirrel/sidebar/sq_previewwidget.cpp
Unescape View File

@ -357,7 +357,7 @@ void SQ_PreviewWidget::mouseDoubleClickEvent(TQMouseEvent *e)
void SQ_PreviewWidget::slotDownloadPercents(int p) void SQ_PreviewWidget::slotDownloadPercents(int p)
{ {
percentString = i18n("Downloading...") + ' ' + KIO::convertSize(p); percentString = i18n("Downloading...") + ' ' + TDEIO::convertSize(p);
update(); update();
} }

2
ksquirrel/sidebar/sq_threaddirlister.cpp
Unescape View File

@ -34,7 +34,7 @@
SQ_ThreadDirLister::SQ_ThreadDirLister(TQObject *o) SQ_ThreadDirLister::SQ_ThreadDirLister(TQObject *o)
: TQThread(), obj(o) : TQThread(), obj(o)
{ {
cache = new KConfig("ksquirrel-tree-cache"); cache = new TDEConfig("ksquirrel-tree-cache");
dir = 0; dir = 0;
} }

4
ksquirrel/sidebar/sq_threaddirlister.h
Unescape View File

@ -30,7 +30,7 @@
class TQObject; class TQObject;
class KConfig; class TDEConfig;
/********************************************************/ /********************************************************/
@ -109,7 +109,7 @@ class SQ_ThreadDirLister : public TQThread
// this object will recieve our events // this object will recieve our events
TQObject *obj; TQObject *obj;
TQMutex mutex; TQMutex mutex;
KConfig *cache; TDEConfig *cache;
DIR *dir; DIR *dir;
}; };

42
ksquirrel/sidebar/sq_treeviewmenu.cpp
Unescape View File

@ -69,9 +69,9 @@ void SQ_TreeViewMenu::slotDirectoryNew()
{ {
KURL dstURL = m_url; KURL dstURL = m_url;
dstURL.addPath(mNewFilename); dstURL.addPath(mNewFilename);
KIO::Job *job = KIO::mkdir(dstURL); TDEIO::Job *job = TDEIO::mkdir(dstURL);
connect(job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotDirectoryResult(KIO::Job *))); connect(job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotDirectoryResult(TDEIO::Job *)));
} }
} }
} }
@ -94,9 +94,9 @@ void SQ_TreeViewMenu::slotDirectoryRename()
KURL renameDstURL = renameSrcURL; KURL renameDstURL = renameSrcURL;
renameDstURL.setFileName(mNewFilename); renameDstURL.setFileName(mNewFilename);
KIO::Job *job = KIO::rename(renameSrcURL, renameDstURL, true); TDEIO::Job *job = TDEIO::rename(renameSrcURL, renameDstURL, true);
connect(job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotDirectoryResult(KIO::Job *))); connect(job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotDirectoryResult(TDEIO::Job *)));
} }
} }
} }
@ -111,9 +111,9 @@ void SQ_TreeViewMenu::slotDirectoryDelete()
"<qt>" + i18n("Are you sure you want to delete <b>%1</b>?").arg(dir) + "</qt>") == KMessageBox::No) "<qt>" + i18n("Are you sure you want to delete <b>%1</b>?").arg(dir) + "</qt>") == KMessageBox::No)
return; return;
KIO::Job *job = KIO::del(m_url); TDEIO::Job *job = TDEIO::del(m_url);
connect(job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotDirectoryResult(KIO::Job *))); connect(job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotDirectoryResult(TDEIO::Job *)));
} }
} }
@ -127,31 +127,31 @@ void SQ_TreeViewMenu::slotDirectoryClear()
"<qt>" + i18n("Are you sure you want to delete contents of <b>%1</b>?").arg(m_url.path()) + "</qt>") == KMessageBox::No) "<qt>" + i18n("Are you sure you want to delete contents of <b>%1</b>?").arg(m_url.path()) + "</qt>") == KMessageBox::No)
return; return;
KIO::Job *job = KIO::listDir(m_url, false, true); TDEIO::Job *job = TDEIO::listDir(m_url, false, true);
connect(job, TQT_SIGNAL(entries(KIO::Job *, const KIO::UDSEntryList &)), this, TQT_SLOT(slotEntries(KIO::Job *, const KIO::UDSEntryList &))); connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), this, TQT_SLOT(slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &)));
connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotListResult(KIO::Job *))); connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotListResult(TDEIO::Job *)));
} }
} }
void SQ_TreeViewMenu::slotEntries(KIO::Job *, const KIO::UDSEntryList &list) void SQ_TreeViewMenu::slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &list)
{ {
KIO::UDSEntryListConstIterator itEnd = list.end(); TDEIO::UDSEntryListConstIterator itEnd = list.end();
TQString suff; TQString suff;
KURL u; KURL u;
static const TQString &dot = TDEGlobal::staticQString("."); static const TQString &dot = TDEGlobal::staticQString(".");
static const TQString &dotdot = TDEGlobal::staticQString(".."); static const TQString &dotdot = TDEGlobal::staticQString("..");
// go through list of KIO::UDSEntrys // go through list of TDEIO::UDSEntrys
for(KIO::UDSEntryListConstIterator it = list.begin(); it != itEnd; ++it) for(TDEIO::UDSEntryListConstIterator it = list.begin(); it != itEnd; ++it)
{ {
KIO::UDSEntry entry = *it; TDEIO::UDSEntry entry = *it;
KIO::UDSEntry::ConstIterator itEnd = entry.end(); TDEIO::UDSEntry::ConstIterator itEnd = entry.end();
for(KIO::UDSEntry::ConstIterator it = entry.begin(); it != itEnd; ++it) for(TDEIO::UDSEntry::ConstIterator it = entry.begin(); it != itEnd; ++it)
{ {
if((*it).m_uds == KIO::UDS_NAME) if((*it).m_uds == TDEIO::UDS_NAME)
{ {
suff = (*it).m_str; suff = (*it).m_str;
@ -168,7 +168,7 @@ void SQ_TreeViewMenu::slotEntries(KIO::Job *, const KIO::UDSEntryList &list)
} }
} }
void SQ_TreeViewMenu::slotListResult(KIO::Job *job) void SQ_TreeViewMenu::slotListResult(TDEIO::Job *job)
{ {
if(!job) return; if(!job) return;
@ -176,12 +176,12 @@ void SQ_TreeViewMenu::slotListResult(KIO::Job *job)
job->showErrorDialog(KSquirrel::app()); job->showErrorDialog(KSquirrel::app());
else if(!urlstodel.isEmpty()) else if(!urlstodel.isEmpty())
{ {
KIO::Job *job = KIO::del(urlstodel); TDEIO::Job *job = TDEIO::del(urlstodel);
connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotDirectoryResult(KIO::Job *))); connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotDirectoryResult(TDEIO::Job *)));
} }
} }
void SQ_TreeViewMenu::slotDirectoryResult(KIO::Job *job) void SQ_TreeViewMenu::slotDirectoryResult(TDEIO::Job *job)
{ {
if(job && job->error()) if(job && job->error())
job->showErrorDialog(KSquirrel::app()); job->showErrorDialog(KSquirrel::app());

8
ksquirrel/sidebar/sq_treeviewmenu.h
Unescape View File

@ -6,7 +6,7 @@
class TQPoint; class TQPoint;
namespace KIO { class Job; } namespace TDEIO { class Job; }
class SQ_TreeViewMenu : public KPopupMenu class SQ_TreeViewMenu : public KPopupMenu
{ {
@ -30,11 +30,11 @@ class SQ_TreeViewMenu : public KPopupMenu
virtual void slotDirectoryRename(); virtual void slotDirectoryRename();
virtual void slotDirectoryDelete(); virtual void slotDirectoryDelete();
virtual void slotDirectoryProperties(); virtual void slotDirectoryProperties();
virtual void slotDirectoryResult(KIO::Job *job); virtual void slotDirectoryResult(TDEIO::Job *job);
void slotDirectoryClear(); void slotDirectoryClear();
void slotEntries(KIO::Job *, const KIO::UDSEntryList &); void slotEntries(TDEIO::Job *, const TDEIO::UDSEntryList &);
void slotListResult(KIO::Job *); void slotListResult(TDEIO::Job *);
protected: protected:
int id_new, id_rename, id_delete, id_prop, id_clear; int id_new, id_rename, id_delete, id_prop, id_clear;

2
ksquirrel/sq_archivehandler.cpp
Unescape View File

@ -104,7 +104,7 @@ void SQ_ArchiveHandler::tryUnpack(const KURL &url, const TQString &mime)
if(!prot.isEmpty()) if(!prot.isEmpty())
{ {
// just change protocol, KIO::get() will do all for us // just change protocol, TDEIO::get() will do all for us
KURL _url = url; KURL _url = url;
_url.setProtocol(prot); _url.setProtocol(prot);

2
ksquirrel/sq_config.cpp
Unescape View File

@ -27,7 +27,7 @@ SQ_Config::SQ_Config(TQObject *parent) : TQObject(parent)
{ {
m_instance = this; m_instance = this;
kconf = new KConfig("ksquirrelrc"); kconf = new TDEConfig("ksquirrelrc");
} }
SQ_Config::~SQ_Config() SQ_Config::~SQ_Config()

4
ksquirrel/sq_config.h
Unescape View File

@ -21,7 +21,7 @@
#include <tqobject.h> #include <tqobject.h>
#include <kconfig.h> #include <kconfig.h>
class KConfig; class TDEConfig;
/* /*
* Class for reading/writing config file * Class for reading/writing config file
@ -61,7 +61,7 @@ class SQ_Config : public TQObject
void writeEntry( const TQString& pKey, const TQValueList<int>& rValue, bool bPersistent = true, bool bGlobal = false, bool bNLS = false ); void writeEntry( const TQString& pKey, const TQValueList<int>& rValue, bool bPersistent = true, bool bGlobal = false, bool bNLS = false );
private: private:
KConfig *kconf; TDEConfig *kconf;
static SQ_Config *m_instance; static SQ_Config *m_instance;
}; };

24
ksquirrel/sq_diroperator.cpp
Unescape View File

@ -72,7 +72,7 @@ SQ_DirOperator::SQ_DirOperator(const KURL &url, ViewT type_, TQWidget *parent, c
{ {
usenew = false; usenew = false;
totalSize = static_cast<KIO::filesize_t>(0); totalSize = static_cast<TDEIO::filesize_t>(0);
// create and insert new actions in context menu // create and insert new actions in context menu
setupActionsMy(); setupActionsMy();
@ -134,7 +134,7 @@ void SQ_DirOperator::slotUrlEntered(const KURL &url)
{ {
usenew = false; usenew = false;
totalSize = static_cast<KIO::filesize_t>(0); totalSize = static_cast<TDEIO::filesize_t>(0);
clearListers(); clearListers();
@ -181,14 +181,14 @@ void SQ_DirOperator::slotFoundMountPoint(const unsigned long &kbSize,
KSquirrel::app()->diskProgress()->setIndicator(kbSize-kbAvail); // kbSize != kbAvail+kbUsed KSquirrel::app()->diskProgress()->setIndicator(kbSize-kbAvail); // kbSize != kbAvail+kbUsed
KSquirrel::app()->sbarWidget("diskSpace")->setText(TQString::fromLatin1("%1: %2/%3") KSquirrel::app()->sbarWidget("diskSpace")->setText(TQString::fromLatin1("%1: %2/%3")
.arg(mount) .arg(mount)
.arg(KIO::convertSizeFromKB(kbAvail)) .arg(TDEIO::convertSizeFromKB(kbAvail))
.arg(KIO::convertSizeFromKB(kbSize))); .arg(TDEIO::convertSizeFromKB(kbSize)));
TQToolTip::add(KSquirrel::app()->sbarWidget("diskSpace"), i18n("<table><tr><td>Mount point:</td><td>%1</td></tr><tr><td>Total size:</td><td>%2</td></tr><tr><td>Used:</td><td>%3</td></tr><tr><td>Available:</td><td>%4</td></tr></table>") TQToolTip::add(KSquirrel::app()->sbarWidget("diskSpace"), i18n("<table><tr><td>Mount point:</td><td>%1</td></tr><tr><td>Total size:</td><td>%2</td></tr><tr><td>Used:</td><td>%3</td></tr><tr><td>Available:</td><td>%4</td></tr></table>")
.arg(mount) .arg(mount)
.arg(KIO::convertSizeFromKB(kbSize)) .arg(TDEIO::convertSizeFromKB(kbSize))
.arg(KIO::convertSizeFromKB(kbUsed)) .arg(TDEIO::convertSizeFromKB(kbUsed))
.arg(KIO::convertSizeFromKB(kbAvail)) .arg(TDEIO::convertSizeFromKB(kbAvail))
); );
} }
@ -291,7 +291,7 @@ void SQ_DirOperator::slotSelectionChanged()
{ {
TQString str = i18n("no files selected"); TQString str = i18n("no files selected");
TQPixmap px; TQPixmap px;
KIO::filesize_t sz = static_cast<KIO::filesize_t>(0); TDEIO::filesize_t sz = static_cast<TDEIO::filesize_t>(0);
int add = 0; int add = 0;
KFileItem *fi = 0; KFileItem *fi = 0;
@ -321,8 +321,8 @@ void SQ_DirOperator::slotSelectionChanged()
// costruct name and size // costruct name and size
str = TQString("%1 %2 %3") str = TQString("%1 %2 %3")
.arg(KStringHandler::csqueeze(fi->name(), SQ_MAX_WORD_LENGTH)) .arg(KStringHandler::csqueeze(fi->name(), SQ_MAX_WORD_LENGTH))
.arg(KIO::convertSize(fi->size())) .arg(TDEIO::convertSize(fi->size()))
.arg(add > 1 ? TQString("<b>[%1/%2]</b>").arg(KIO::convertSize(sz)).arg(add):""); .arg(add > 1 ? TQString("<b>[%1/%2]</b>").arg(TDEIO::convertSize(sz)).arg(add):"");
} }
// update statusbar // update statusbar
@ -558,7 +558,7 @@ void SQ_DirOperator::slotUpdateInformation(int files, int dirs)
SQ_Config::instance()->setGroup("Fileview"); SQ_Config::instance()->setGroup("Fileview");
TQString str = i18n("Total %1 in %2 (%3, %4)") TQString str = i18n("Total %1 in %2 (%3, %4)")
.arg(KIO::convertSize(totalSize)) .arg(TDEIO::convertSize(totalSize))
.arg(i18n("1 item", "%n items", total)) .arg(i18n("1 item", "%n items", total))
.arg(i18n("1 folder", "%n folders", dirs)) .arg(i18n("1 folder", "%n folders", dirs))
.arg(i18n("1 file", "%n files", files)); .arg(i18n("1 file", "%n files", files));
@ -992,7 +992,7 @@ void SQ_DirOperator::slotSetURL(const KURL &url)
void SQ_DirOperator::calcTotalSize() void SQ_DirOperator::calcTotalSize()
{ {
totalSize = static_cast<KIO::filesize_t>(0); totalSize = static_cast<TDEIO::filesize_t>(0);
KFileItemList *list = const_cast<KFileItemList *>(fileview->items()); KFileItemList *list = const_cast<KFileItemList *>(fileview->items());

2
ksquirrel/sq_diroperator.h
Unescape View File

@ -253,7 +253,7 @@ class SQ_DirOperator : public KDirOperator
KURL lasturl; KURL lasturl;
bool usenew; bool usenew;
TQString m_pending; TQString m_pending;
KIO::filesize_t totalSize; TDEIO::filesize_t totalSize;
KFileItemList oldSelected; KFileItemList oldSelected;
KFileItem *oldCurrentItem; KFileItem *oldCurrentItem;
SQ_Downloader *down; SQ_Downloader *down;

14
ksquirrel/sq_downloader.cpp
Unescape View File

@ -60,17 +60,17 @@ void SQ_Downloader::start(KFileItem *fi)
nomime = true; nomime = true;
#endif #endif
job = KIO::get(mURL, false, false); job = TDEIO::get(mURL, false, false);
clean(); clean();
continueDownload = false; continueDownload = false;
connect(job, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &))); connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotDataResult(KIO::Job *))); connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotDataResult(TDEIO::Job *)));
} }
void SQ_Downloader::slotData(KIO::Job *job, const TQByteArray &ba) void SQ_Downloader::slotData(TDEIO::Job *job, const TQByteArray &ba)
{ {
size += ba.size(); size += ba.size();
@ -106,17 +106,17 @@ void SQ_Downloader::slotData(KIO::Job *job, const TQByteArray &ba)
} }
} }
void SQ_Downloader::slotDataResult(KIO::Job *cpjob) void SQ_Downloader::slotDataResult(TDEIO::Job *cpjob)
{ {
job = 0; job = 0;
// job error // job error
if(cpjob->error() && cpjob->error() != KIO::ERR_USER_CANCELED) if(cpjob->error() && cpjob->error() != TDEIO::ERR_USER_CANCELED)
{ {
m_error = true; m_error = true;
emit result(mEmptyURL); emit result(mEmptyURL);
} }
else if(cpjob->error() == KIO::ERR_USER_CANCELED) // not supported image/archive type - else if(cpjob->error() == TDEIO::ERR_USER_CANCELED) // not supported image/archive type -
// emit empty url without errors // emit empty url without errors
{ {
emit result(mEmptyURL); emit result(mEmptyURL);

10
ksquirrel/sq_downloader.h
Unescape View File

@ -26,7 +26,7 @@
class KFileItem; class KFileItem;
class KTempFile; class KTempFile;
namespace KIO { class Job; } namespace TDEIO { class Job; }
class SQ_Downloader : public TQObject class SQ_Downloader : public TQObject
{ {
@ -50,14 +50,14 @@ class SQ_Downloader : public TQObject
void percents(int); void percents(int);
private slots: private slots:
void slotData(KIO::Job *job, const TQByteArray &data); void slotData(TDEIO::Job *job, const TQByteArray &data);
void slotDataResult(KIO::Job *); void slotDataResult(TDEIO::Job *);
private: private:
KIO::Job *job; TDEIO::Job *job;
KURL mEmptyURL, mURL; KURL mEmptyURL, mURL;
KTempFile *tmp; KTempFile *tmp;
KIO::filesize_t totalSize, size; TDEIO::filesize_t totalSize, size;
bool continueDownload; bool continueDownload;
bool nomime; bool nomime;
bool m_error, m_lightmode; bool m_error, m_lightmode;

2
ksquirrel/sq_filedetailview.cpp
Unescape View File

@ -147,7 +147,7 @@ void SQ_FileDetailView::initItem(SQ_FileListViewItem *item, const KFileItem *i)
TQDir::SortSpec spec = KFileView::sorting(); TQDir::SortSpec spec = KFileView::sorting();
if(spec & TQDir::Time) if(spec & TQDir::Time)
item->setKey(sortingKey(i->time(KIO::UDS_MODIFICATION_TIME), i->isDir(), spec)); item->setKey(sortingKey(i->time(TDEIO::UDS_MODIFICATION_TIME), i->isDir(), spec));
else if(spec & TQDir::Size) else if(spec & TQDir::Size)
item->setKey(sortingKey(i->size(), i->isDir(), spec)); item->setKey(sortingKey(i->size(), i->isDir(), spec));
else else

2
ksquirrel/sq_fileiconviewbase.cpp
Unescape View File

@ -146,7 +146,7 @@ void SQ_FileIconViewBase::initItemMy(KFileIconViewItem *item, const KFileItem *i
TQDir::SortSpec spec = KFileView::sorting(); TQDir::SortSpec spec = KFileView::sorting();
if(spec & TQDir::Time) if(spec & TQDir::Time)
item->setKey(sortingKey((unsigned long)i->time(KIO::UDS_MODIFICATION_TIME), i->isDir(), spec)); item->setKey(sortingKey((unsigned long)i->time(TDEIO::UDS_MODIFICATION_TIME), i->isDir(), spec));
else if(spec & TQDir::Size) else if(spec & TQDir::Size)
item->setKey(sortingKey(i->size(), i->isDir(), spec)); item->setKey(sortingKey(i->size(), i->isDir(), spec));
else else

2
ksquirrel/sq_filethumbview.cpp
Unescape View File

@ -167,7 +167,7 @@ void SQ_FileThumbView::setThumbnailPixmap(const KFileItem* fileItem, const SQ_Th
if(t.w && t.h) painter.drawText(4, W+rest/2-12, 100, 12, 0, TQString::fromLatin1("%1x%2").arg(t.w).arg(t.h)); if(t.w && t.h) painter.drawText(4, W+rest/2-12, 100, 12, 0, TQString::fromLatin1("%1x%2").arg(t.w).arg(t.h));
painter.drawText(4, W+rest/2+1, 100, 12, 0, KIO::convertSize(fileItem->size())); painter.drawText(4, W+rest/2+1, 100, 12, 0, TDEIO::convertSize(fileItem->size()));
painter.end(); painter.end();
} }
else else

4
ksquirrel/sq_glwidget.cpp
Unescape View File

@ -1515,7 +1515,7 @@ void SQ_GLWidget::decode()
{ {
KMessageBox::error(this, KMessageBox::error(this,
i18n("Memory allocation failed for %1 of memory") i18n("Memory allocation failed for %1 of memory")
.arg(KIO::convertSize(pp.realw * pp.realh * sizeof(RGBA)))); .arg(TDEIO::convertSize(pp.realw * pp.realh * sizeof(RGBA))));
decodeFailedOn0(SQE_R_NOMEMORY); decodeFailedOn0(SQE_R_NOMEMORY);
return; return;
@ -1997,7 +1997,7 @@ void SQ_GLWidget::setDownloadPercents(int p)
percentsLabel->hide(); percentsLabel->hide();
else else
{ {
percentsLabel->setText(i18n("Downloading...") + ' ' + KIO::convertSize(p)); percentsLabel->setText(i18n("Downloading...") + ' ' + TDEIO::convertSize(p));
percentsLabel->adjustSize(); percentsLabel->adjustSize();
percentsLabel->show(); percentsLabel->show();
} }

6
ksquirrel/sq_glwidget.h
Unescape View File

@ -55,7 +55,7 @@ class KPopupMenu;
class KRadioAction; class KRadioAction;
class KTempFile; class KTempFile;
namespace KIO { class Job; } namespace TDEIO { class Job; }
class TQTimer; class TQTimer;
class TQPopupMenu; class TQPopupMenu;
@ -475,7 +475,7 @@ class SQ_GLWidget : public TQGLWidget
void slotChangeTab(int); void slotChangeTab(int);
void slotCloseRequest(int); void slotCloseRequest(int);
void slotCopyJobResult(KIO::Job *job); void slotCopyJobResult(TDEIO::Job *job);
/* /*
* Slots for toolbar's actions: * Slots for toolbar's actions:
@ -516,7 +516,7 @@ class SQ_GLWidget : public TQGLWidget
void slotBCG(SQ_ImageBCGOptions *); void slotBCG(SQ_ImageBCGOptions *);
void slotFilter(SQ_ImageFilterOptions *fltopt); void slotFilter(SQ_ImageFilterOptions *fltopt);
void slotCopyResult(KIO::Job *); void slotCopyResult(TDEIO::Job *);
private: private:
KAction *pASelectionClear; KAction *pASelectionClear;

32
ksquirrel/sq_glwidget_stuff.cpp
Unescape View File

@ -220,7 +220,7 @@ void SQ_GLWidget::slotProperties()
stopAnimation(); stopAnimation();
const int real_size = tab->finfo.image[tab->current].w * tab->finfo.image[tab->current].h * sizeof(RGBA); const int real_size = tab->finfo.image[tab->current].w * tab->finfo.image[tab->current].h * sizeof(RGBA);
TQString sz = KIO::convertSize(real_size); TQString sz = TDEIO::convertSize(real_size);
TQStringList list; TQStringList list;
TQValueVector<TQPair<TQString,TQString> > meta; TQValueVector<TQPair<TQString,TQString> > meta;
@ -603,13 +603,13 @@ void SQ_GLWidget::saveAs()
if(!url.isLocalFile()) if(!url.isLocalFile())
{ {
// src dst perm overwrite resume progress // src dst perm overwrite resume progress
KIO::Job *j = KIO::file_copy(path, url, -1, true, false, false); TDEIO::Job *j = TDEIO::file_copy(path, url, -1, true, false, false);
connect(j, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyResult(KIO::Job *))); connect(j, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyResult(TDEIO::Job *)));
} }
} }
void SQ_GLWidget::slotCopyResult(KIO::Job *job) void SQ_GLWidget::slotCopyResult(TDEIO::Job *job)
{ {
if(job->error()) if(job->error())
{ {
@ -627,8 +627,8 @@ void SQ_GLWidget::slotCopyResult(KIO::Job *job)
if(result == TQDialog::Rejected || d.selectedURL().isEmpty()) if(result == TQDialog::Rejected || d.selectedURL().isEmpty())
return; return;
KIO::Job *j = KIO::file_copy(tmp->name(), d.selectedURL(), -1, true, false, false); TDEIO::Job *j = TDEIO::file_copy(tmp->name(), d.selectedURL(), -1, true, false, false);
connect(j, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyResult(KIO::Job *))); connect(j, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyResult(TDEIO::Job *)));
} }
} }
} }
@ -1061,27 +1061,27 @@ void SQ_GLWidget::slotAccelActivated()
return; return;
lastCopy = url; lastCopy = url;
KIO::Job *job; TDEIO::Job *job;
if(!ks.compare(TQt::Key_F5)) if(!ks.compare(TQt::Key_F5))
job = KIO::copy(tab->m_original, url); job = TDEIO::copy(tab->m_original, url);
else else
job = KIO::move(tab->m_original, url); job = TDEIO::move(tab->m_original, url);
job->setWindow(this); job->setWindow(this);
connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyJobResult(KIO::Job *))); connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyJobResult(TDEIO::Job *)));
} }
else if(!ks.compare(TQt::Key_F7) || !ks.compare(TQt::Key_F8)) else if(!ks.compare(TQt::Key_F7) || !ks.compare(TQt::Key_F8))
{ {
KIO::Job *job; TDEIO::Job *job;
if(!ks.compare(TQt::Key_F6)) if(!ks.compare(TQt::Key_F6))
job = KIO::copy(tab->m_original, lastCopy); job = TDEIO::copy(tab->m_original, lastCopy);
else else
job = KIO::move(tab->m_original, lastCopy); job = TDEIO::move(tab->m_original, lastCopy);
job->setWindow(this); job->setWindow(this);
connect(job, TQT_SIGNAL(result(KIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyJobResult(KIO::Job *))); connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_TQOBJECT(this), TQT_SLOT(slotCopyJobResult(TDEIO::Job *)));
} }
else if(!ks.compare(TQt::Key_F9)) copyURL(); else if(!ks.compare(TQt::Key_F9)) copyURL();
else if(!ks.compare(TQt::Key_Slash)) slotShowHelp(); else if(!ks.compare(TQt::Key_Slash)) slotShowHelp();
@ -1143,7 +1143,7 @@ void SQ_GLWidget::zoom(GLfloat val)
matrix_zoom(val); matrix_zoom(val);
} }
void SQ_GLWidget::slotCopyJobResult(KIO::Job *job) void SQ_GLWidget::slotCopyJobResult(TDEIO::Job *job)
{ {
if(job->error()) if(job->error())
job->showErrorDialog(this); job->showErrorDialog(this);
@ -1224,7 +1224,7 @@ void SQ_GLWidget::crop()
{ {
KMessageBox::error(this, KMessageBox::error(this,
i18n("Memory allocation failed for %1 of memory") i18n("Memory allocation failed for %1 of memory")
.arg(KIO::convertSize(pp.realw * pp.realh * sizeof(RGBA)))); .arg(TDEIO::convertSize(pp.realw * pp.realh * sizeof(RGBA))));
return; return;
} }

4
ksquirrel/sq_imageproperties.ui
Unescape View File

@ -936,7 +936,7 @@
<forwards> <forwards>
<forward>class KPopupMenu;</forward> <forward>class KPopupMenu;</forward>
<forward>class KAction;</forward> <forward>class KAction;</forward>
<forward>namespace KIO { class Job; }</forward> <forward>namespace TDEIO { class Job; }</forward>
</forwards> </forwards>
<variables> <variables>
<variable access="private">KURL url;</variable> <variable access="private">KURL url;</variable>
@ -954,7 +954,7 @@
<slot access="private">slotCopyAll()</slot> <slot access="private">slotCopyAll()</slot>
<slot access="private">slotCopyEntry()</slot> <slot access="private">slotCopyEntry()</slot>
<slot access="private" specifier="non virtual">slotModeClicked( int id )</slot> <slot access="private" specifier="non virtual">slotModeClicked( int id )</slot>
<slot access="private">slotStatResult( KIO::Job * job )</slot> <slot access="private">slotStatResult( TDEIO::Job * job )</slot>
</Q_SLOTS> </Q_SLOTS>
<functions> <functions>
<function access="private" specifier="non virtual">init()</function> <function access="private" specifier="non virtual">init()</function>

16
ksquirrel/sq_imageproperties.ui.h
Unescape View File

@ -84,8 +84,8 @@ void SQ_ImageProperties::setURL(const KURL &_url)
void SQ_ImageProperties::setFileParams() void SQ_ImageProperties::setFileParams()
{ {
KIO::Job *stjob = KIO::stat(url, false); TDEIO::Job *stjob = TDEIO::stat(url, false);
connect(stjob, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotStatResult(KIO::Job *))); connect(stjob, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotStatResult(TDEIO::Job *)));
#ifdef SQ_HAVE_KEXIF #ifdef SQ_HAVE_KEXIF
SQ_Config::instance()->setGroup("GL view"); SQ_Config::instance()->setGroup("GL view");
@ -230,11 +230,11 @@ void SQ_ImageProperties::slotModeClicked(int id)
#endif #endif
} }
void SQ_ImageProperties::slotStatResult(KIO::Job *job) void SQ_ImageProperties::slotStatResult(TDEIO::Job *job)
{ {
if(!job->error()) if(!job->error())
{ {
KIO::UDSEntry entry = static_cast<KIO::StatJob*>(job)->statResult(); TDEIO::UDSEntry entry = static_cast<TDEIO::StatJob*>(job)->statResult();
KFileItem fi(entry, url); KFileItem fi(entry, url);
KURL t = url; KURL t = url;
@ -242,17 +242,17 @@ void SQ_ImageProperties::slotStatResult(KIO::Job *job)
lineDirectory->setText(t.isLocalFile() ? t.path() : t.prettyURL()); lineDirectory->setText(t.isLocalFile() ? t.path() : t.prettyURL());
lineFile->setText(fi.name()); lineFile->setText(fi.name());
textSize->setText(KIO::convertSize(fi.size())); textSize->setText(TDEIO::convertSize(fi.size()));
textOwner->setText(TQString("%1").arg(fi.user())); textOwner->setText(TQString("%1").arg(fi.user()));
textGroup->setText(TQString("%1").arg(fi.group())); textGroup->setText(TQString("%1").arg(fi.group()));
textPermissions->setText(fi.permissionsString()); textPermissions->setText(fi.permissionsString());
TQDateTime abs; TQDateTime abs;
abs.setTime_t(fi.time(KIO::UDS_CREATION_TIME)); abs.setTime_t(fi.time(TDEIO::UDS_CREATION_TIME));
textCreated->setText(abs.toString("dd/MM/yyyy hh:mm:ss")); textCreated->setText(abs.toString("dd/MM/yyyy hh:mm:ss"));
abs.setTime_t(fi.time(KIO::UDS_ACCESS_TIME)); abs.setTime_t(fi.time(TDEIO::UDS_ACCESS_TIME));
textLastRead->setText(abs.toString("dd/MM/yyyy hh:mm:ss")); textLastRead->setText(abs.toString("dd/MM/yyyy hh:mm:ss"));
abs.setTime_t(fi.time(KIO::UDS_MODIFICATION_TIME)); abs.setTime_t(fi.time(TDEIO::UDS_MODIFICATION_TIME));
textLastMod->setText(abs.toString("dd/MM/yyyy hh:mm:ss")); textLastMod->setText(abs.toString("dd/MM/yyyy hh:mm:ss"));
} }
} }

2
ksquirrel/sq_libraryhandler.cpp
Unescape View File

@ -53,7 +53,7 @@ SQ_LibraryHandler::SQ_LibraryHandler(TQObject *parent)
kdDebug() << "+SQ_LibraryHandler" << endl; kdDebug() << "+SQ_LibraryHandler" << endl;
kconf = new KConfig("ksquirrel-codec-settings"); kconf = new TDEConfig("ksquirrel-codec-settings");
load(); load();
} }

4
ksquirrel/sq_libraryhandler.h
Unescape View File

@ -26,7 +26,7 @@
class TQStringList; class TQStringList;
class KConfig; class TDEConfig;
class KURL; class KURL;
/* /*
@ -120,7 +120,7 @@ class SQ_LibraryHandler : public TQObject, public TQValueVector<SQ_LIBRARY>
void readSettings(SQ_LIBRARY *lib); void readSettings(SQ_LIBRARY *lib);
private: private:
KConfig *kconf; TDEConfig *kconf;
static SQ_LibraryHandler *m_instance; static SQ_LibraryHandler *m_instance;
}; };

14
ksquirrel/sq_navigatordropmenu.cpp
Unescape View File

@ -68,27 +68,27 @@ void SQ_NavigatorDropMenu::slotCopy()
{ {
if(also) emit done(url, SQ_NavigatorDropMenu::Copy); if(also) emit done(url, SQ_NavigatorDropMenu::Copy);
KIO::Job *job = KIO::copy(list, url); TDEIO::Job *job = TDEIO::copy(list, url);
connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotJobResult(KIO::Job *))); connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobResult(TDEIO::Job *)));
} }
void SQ_NavigatorDropMenu::slotMove() void SQ_NavigatorDropMenu::slotMove()
{ {
if(also) emit done(url, SQ_NavigatorDropMenu::Move); if(also) emit done(url, SQ_NavigatorDropMenu::Move);
KIO::Job *job = KIO::move(list, url); TDEIO::Job *job = TDEIO::move(list, url);
connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotJobResult(KIO::Job *))); connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobResult(TDEIO::Job *)));
} }
void SQ_NavigatorDropMenu::slotLink() void SQ_NavigatorDropMenu::slotLink()
{ {
if(also) emit done(url, SQ_NavigatorDropMenu::Link); if(also) emit done(url, SQ_NavigatorDropMenu::Link);
KIO::Job *job = KIO::link(list, url); TDEIO::Job *job = TDEIO::link(list, url);
connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotJobResult(KIO::Job *))); connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobResult(TDEIO::Job *)));
} }
void SQ_NavigatorDropMenu::slotJobResult(KIO::Job *job) void SQ_NavigatorDropMenu::slotJobResult(TDEIO::Job *job)
{ {
if(job && job->error()) if(job && job->error())
job->showErrorDialog(KSquirrel::app()); job->showErrorDialog(KSquirrel::app());

4
ksquirrel/sq_navigatordropmenu.h
Unescape View File

@ -23,7 +23,7 @@
#include <kurl.h> #include <kurl.h>
namespace KIO { class Job; } namespace TDEIO { class Job; }
class SQ_PopupMenu; class SQ_PopupMenu;
@ -74,7 +74,7 @@ class SQ_NavigatorDropMenu : public TQObject
void slotCopy(); void slotCopy();
void slotMove(); void slotMove();
void slotLink(); void slotLink();
void slotJobResult(KIO::Job *); void slotJobResult(TDEIO::Job *);
signals: signals:
void done(const KURL &, int); void done(const KURL &, int);

2
ksquirrel/sq_slideshowwidget.cpp
Unescape View File

@ -351,7 +351,7 @@ void SQ_SlideShowWidget::constructMessage()
if(mes_name) s_message += fm.fileName(); if(mes_name) s_message += fm.fileName();
if(mes_size) if(mes_size)
s_message = (mes_name || mes_pos) ? (s_message + " (" + KIO::convertSize(fm.size()) + ')') : KIO::convertSize(fm.size()); s_message = (mes_name || mes_pos) ? (s_message + " (" + TDEIO::convertSize(fm.size()) + ')') : TDEIO::convertSize(fm.size());
message->setText(s_message); message->setText(s_message);
message->adjustSize(); message->adjustSize();

2
ksquirrel/sq_thumbnailcachemaster.ui
Unescape View File

@ -243,7 +243,7 @@
<Q_SLOTS> <Q_SLOTS>
<slot access="private">slotCalcCache()</slot> <slot access="private">slotCalcCache()</slot>
<slot access="private">slotClearCache()</slot> <slot access="private">slotClearCache()</slot>
<slot access="private">slotClearFinished( KIO::Job * )</slot> <slot access="private">slotClearFinished( TDEIO::Job * )</slot>
<slot access="private">slotClearMemoryCache()</slot> <slot access="private">slotClearMemoryCache()</slot>
<slot access="private">slotCalcCacheMemory()</slot> <slot access="private">slotCalcCacheMemory()</slot>
<slot access="private">slotShowDiskCache()</slot> <slot access="private">slotShowDiskCache()</slot>

12
ksquirrel/sq_thumbnailcachemaster.ui.h
Unescape View File

@ -30,7 +30,7 @@ void SQ_ThumbnailCacheMaster::slotCalcCache()
int size = KDirSize::dirSize(url); int size = KDirSize::dirSize(url);
TQString s = KIO::convertSize(size); TQString s = TDEIO::convertSize(size);
textThumbSize->setText(s); textThumbSize->setText(s);
} }
@ -43,11 +43,11 @@ void SQ_ThumbnailCacheMaster::slotClearCache()
KURL url = tmp.root(); KURL url = tmp.root();
KIO::DeleteJob *job = KIO::del(url); TDEIO::DeleteJob *job = TDEIO::del(url);
connect(job, TQT_SIGNAL(result(KIO::Job*)), this, TQT_SLOT(slotClearFinished(KIO::Job*))); connect(job, TQT_SIGNAL(result(TDEIO::Job*)), this, TQT_SLOT(slotClearFinished(TDEIO::Job*)));
} }
void SQ_ThumbnailCacheMaster::slotClearFinished( KIO::Job * ) void SQ_ThumbnailCacheMaster::slotClearFinished( TDEIO::Job * )
{ {
TQApplication::restoreOverrideCursor(); TQApplication::restoreOverrideCursor();
slotCalcCache(); slotCalcCache();
@ -66,8 +66,8 @@ void SQ_ThumbnailCacheMaster::slotClearMemoryCache()
void SQ_ThumbnailCacheMaster::slotCalcCacheMemory() void SQ_ThumbnailCacheMaster::slotCalcCacheMemory()
{ {
textCacheMemSize->setText(TQString::fromLatin1("%1/%2") textCacheMemSize->setText(TQString::fromLatin1("%1/%2")
.arg(KIO::convertSize(SQ_PixmapCache::instance()->totalSize())) .arg(TDEIO::convertSize(SQ_PixmapCache::instance()->totalSize()))
.arg(KIO::convertSize(SQ_PixmapCache::instance()->cacheLimit()))); .arg(TDEIO::convertSize(SQ_PixmapCache::instance()->cacheLimit())));
} }
void SQ_ThumbnailCacheMaster::slotShowDiskCache() void SQ_ThumbnailCacheMaster::slotShowDiskCache()

32
ksquirrel/sq_thumbnailloadjob.cpp
Unescape View File

@ -58,7 +58,7 @@
#define SQ_PREDOWNLOAD_SIZE 20 #define SQ_PREDOWNLOAD_SIZE 20
SQ_ThumbnailLoadJob::SQ_ThumbnailLoadJob(const KFileItemList &items, SQ_FileThumbView *parnt) SQ_ThumbnailLoadJob::SQ_ThumbnailLoadJob(const KFileItemList &items, SQ_FileThumbView *parnt)
: KIO::Job(false), parent(parnt) : TDEIO::Job(false), parent(parnt)
{ {
mBrokenThumbnail.thumbnail = TDEGlobal::iconLoader()->loadIcon("file_broken", KIcon::Desktop, SQ_ThumbnailSize::smallest()); mBrokenThumbnail.thumbnail = TDEGlobal::iconLoader()->loadIcon("file_broken", KIcon::Desktop, SQ_ThumbnailSize::smallest());
mItems = items; mItems = items;
@ -144,7 +144,7 @@ void SQ_ThumbnailLoadJob::nextFile(bool b)
{ {
if(b) if(b)
{ {
KIO::Job *j = subjobs.first(); TDEIO::Job *j = subjobs.first();
if(j) if(j)
{ {
@ -203,14 +203,14 @@ void SQ_ThumbnailLoadJob::determineNextIcon()
mCurrentURL = mCurrentItem->url(); mCurrentURL = mCurrentItem->url();
mItems.removeFirst(); mItems.removeFirst();
KIO::StatJob *job = KIO::stat(mCurrentURL, false); TDEIO::StatJob *job = TDEIO::stat(mCurrentURL, false);
job->setSide(true); job->setSide(true);
job->setDetails(0); job->setDetails(0);
addSubjob(job); addSubjob(job);
} }
} }
void SQ_ThumbnailLoadJob::slotResult(KIO::Job *job) void SQ_ThumbnailLoadJob::slotResult(TDEIO::Job *job)
{ {
subjobs.remove(job); subjobs.remove(job);
// Q_ASSERT(subjobs.isEmpty()); // Q_ASSERT(subjobs.isEmpty());
@ -219,23 +219,23 @@ void SQ_ThumbnailLoadJob::slotResult(KIO::Job *job)
{ {
case STATE_STATORIG: case STATE_STATORIG:
{ {
KIO::UDSEntry entry = mCurrentItem->entry(); TDEIO::UDSEntry entry = mCurrentItem->entry();
KIO::UDSEntry::ConstIterator it = entry.begin(); TDEIO::UDSEntry::ConstIterator it = entry.begin();
mOriginalTime = 0; mOriginalTime = 0;
size = totalSize = 0; size = totalSize = 0;
TQString suff; TQString suff;
for(; it != entry.end(); ++it) 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); mOriginalTime = (time_t)((*it).m_long);
} }
else if((*it).m_uds == KIO::UDS_SIZE) else if((*it).m_uds == TDEIO::UDS_SIZE)
{ {
totalSize = (KIO::filesize_t)((*it).m_long); totalSize = (TDEIO::filesize_t)((*it).m_long);
} }
else if((*it).m_uds == KIO::UDS_NAME) else if((*it).m_uds == TDEIO::UDS_NAME)
{ {
suff = (*it).m_str; suff = (*it).m_str;
} }
@ -263,10 +263,10 @@ void SQ_ThumbnailLoadJob::slotResult(KIO::Job *job)
mTempURL.setPath(tmp->name()); mTempURL.setPath(tmp->name());
KIO::Job *cpjob = KIO::get(mCurrentURL, false, false); TDEIO::Job *cpjob = TDEIO::get(mCurrentURL, false, false);
connect(cpjob, TQT_SIGNAL(data(KIO::Job *, const TQByteArray &)), connect(cpjob, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
this, TQT_SLOT(slotData(KIO::Job *, const TQByteArray &))); this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
addSubjob(cpjob); addSubjob(cpjob);
} }
@ -278,7 +278,7 @@ void SQ_ThumbnailLoadJob::slotResult(KIO::Job *job)
case STATE_PREDOWNLOAD: case STATE_PREDOWNLOAD:
{ {
// error // error
if(job->error() && job->error() != KIO::ERR_USER_CANCELED) if(job->error() && job->error() != TDEIO::ERR_USER_CANCELED)
emitThumbnailLoadingFailed(); emitThumbnailLoadingFailed();
// no errors, or canceled // no errors, or canceled
@ -303,7 +303,7 @@ void SQ_ThumbnailLoadJob::slotResult(KIO::Job *job)
} }
} }
void SQ_ThumbnailLoadJob::slotData(KIO::Job *job, const TQByteArray &data) void SQ_ThumbnailLoadJob::slotData(TDEIO::Job *job, const TQByteArray &data)
{ {
if(!data.size()) if(!data.size())
return; return;
@ -474,7 +474,7 @@ void SQ_ThumbnailLoadJob::kill(bool q)
{ {
donothing = true; donothing = true;
KIO::Job::kill(q); TDEIO::Job::kill(q);
} }
#include "sq_thumbnailloadjob.moc" #include "sq_thumbnailloadjob.moc"

8
ksquirrel/sq_thumbnailloadjob.h
Unescape View File

@ -43,7 +43,7 @@ typedef TQPtrList<KFileItem> KFileItemList;
* in given directory. * in given directory.
*/ */
class SQ_ThumbnailLoadJob : public KIO::Job class SQ_ThumbnailLoadJob : public TDEIO::Job
{ {
Q_OBJECT Q_OBJECT
@ -77,8 +77,8 @@ class SQ_ThumbnailLoadJob : public KIO::Job
void done(); void done();
private slots: private slots:
void slotResult(KIO::Job *job); void slotResult(TDEIO::Job *job);
void slotData(KIO::Job *job, const TQByteArray &data); void slotData(TDEIO::Job *job, const TQByteArray &data);
private: private:
enum { STATE_STATORIG, STATE_PREDOWNLOAD, STATE_DOWNLOAD } mState; enum { STATE_STATORIG, STATE_PREDOWNLOAD, STATE_DOWNLOAD } mState;
@ -88,7 +88,7 @@ class SQ_ThumbnailLoadJob : public KIO::Job
KURL mCurrentURL; KURL mCurrentURL;
KURL mThumbURL; KURL mThumbURL;
KURL mTempURL; KURL mTempURL;
KIO::filesize_t totalSize, size; TDEIO::filesize_t totalSize, size;
KTempFile *tmp; KTempFile *tmp;
time_t mOriginalTime; time_t mOriginalTime;
TQString mime; TQString mime;

2
ksquirrel/sq_thumbnailsunused.cpp
Unescape View File

@ -25,7 +25,7 @@ SQ_ThumbnailsUnused::SQ_ThumbnailsUnused(TQObject *parent) : TQObject(parent), T
{ {
m_instance = this; m_instance = this;
cache = new KConfig("ksquirrel-unused-cache"); cache = new TDEConfig("ksquirrel-unused-cache");
load(); load();
} }

4
ksquirrel/sq_thumbnailsunused.h
Unescape View File

@ -25,7 +25,7 @@
#include <ctime> #include <ctime>
class KConfig; class TDEConfig;
/* /*
* This is small helper class for thumbnail loader. It is used only on * This is small helper class for thumbnail loader. It is used only on
@ -50,7 +50,7 @@ class SQ_ThumbnailsUnused : public TQObject, public TQMap<KURL, time_t>
private: private:
static SQ_ThumbnailsUnused *m_instance; static SQ_ThumbnailsUnused *m_instance;
KConfig *cache; TDEConfig *cache;
}; };
#endif #endif

18
ksquirrel/sq_widgetstack.cpp
Unescape View File

@ -562,14 +562,14 @@ void SQ_WidgetStack::slotFilePaste()
// get current url // get current url
KURL _url = url(); KURL _url = url();
emitNewLastURL(_url); emitNewLastURL(_url);
KIO::Job *job; TDEIO::Job *job;
// now copy or move files to current url // now copy or move files to current url
job = (fileaction == SQ_WidgetStack::Copy) ? KIO::copy(files, _url) : KIO::move(files, _url); job = (fileaction == SQ_WidgetStack::Copy) ? TDEIO::copy(files, _url) : TDEIO::move(files, _url);
connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotJobResult(KIO::Job *))); connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobResult(TDEIO::Job *)));
} }
void SQ_WidgetStack::slotJobResult(KIO::Job *job) void SQ_WidgetStack::slotJobResult(TDEIO::Job *job)
{ {
if(job && job->error()) if(job && job->error())
job->showErrorDialog(KSquirrel::app()); job->showErrorDialog(KSquirrel::app());
@ -604,8 +604,8 @@ void SQ_WidgetStack::repeat()
if(lastURL.isEmpty() || files.isEmpty()) if(lastURL.isEmpty() || files.isEmpty())
return; return;
KIO::Job *job = (fileaction == SQ_WidgetStack::Copy) ? KIO::copy(files, lastURL) : KIO::move(files, lastURL); TDEIO::Job *job = (fileaction == SQ_WidgetStack::Copy) ? TDEIO::copy(files, lastURL) : TDEIO::move(files, lastURL);
connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SLOT(slotJobResult(KIO::Job *))); connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotJobResult(TDEIO::Job *)));
} }
// Create links // Create links
@ -624,7 +624,7 @@ void SQ_WidgetStack::slotFileLinkTo()
emitNewLastURL(url); emitNewLastURL(url);
// create symlinks // create symlinks
KIO::link(files, url); TDEIO::link(files, url);
} }
// Copy to... // Copy to...
@ -643,7 +643,7 @@ void SQ_WidgetStack::slotFileCopyTo()
emitNewLastURL(url); emitNewLastURL(url);
// copy files to selected directory // copy files to selected directory
KIO::copy(files, url); TDEIO::copy(files, url);
} }
// Move to... // Move to...
@ -662,7 +662,7 @@ void SQ_WidgetStack::slotFileMoveTo()
emitNewLastURL(url); emitNewLastURL(url);
// move files to selected directory // move files to selected directory
KIO::move(files, url); TDEIO::move(files, url);
} }
/* /*

4
ksquirrel/sq_widgetstack.h
Unescape View File

@ -26,7 +26,7 @@
#include "sq_diroperator.h" #include "sq_diroperator.h"
namespace KIO { class Job; } namespace TDEIO { class Job; }
class TQTimer; class TQTimer;
@ -210,7 +210,7 @@ class SQ_WidgetStack : public TQObject
void slotTreeMenuDone(const KURL &, int); void slotTreeMenuDone(const KURL &, int);
void slotJobResult(KIO::Job *job); void slotJobResult(TDEIO::Job *job);
/* /*
* User wants to select to deselect some files. * User wants to select to deselect some files.

Write Preview
Loading…
Cancel
Save