diff options
Diffstat (limited to 'tdeioslave/trash')
-rw-r--r-- | tdeioslave/trash/DESIGN | 2 | ||||
-rw-r--r-- | tdeioslave/trash/Makefile.am | 2 | ||||
-rw-r--r-- | tdeioslave/trash/discspaceutil.cpp | 6 | ||||
-rw-r--r-- | tdeioslave/trash/discspaceutil.h | 2 | ||||
-rw-r--r-- | tdeioslave/trash/kcmtrash.cpp | 4 | ||||
-rw-r--r-- | tdeioslave/trash/kcmtrash.h | 2 | ||||
-rw-r--r-- | tdeioslave/trash/ktrashpropsdlgplugin.cpp | 2 | ||||
-rw-r--r-- | tdeioslave/trash/ktrashpropsdlgplugin.h | 2 | ||||
-rw-r--r-- | tdeioslave/trash/ktrashpropswidget.cpp | 20 | ||||
-rw-r--r-- | tdeioslave/trash/ktrashpropswidget.h | 2 | ||||
-rw-r--r-- | tdeioslave/trash/tdefile-plugin/RETURNED_ITEMS | 2 | ||||
-rw-r--r-- | tdeioslave/trash/tdefile-plugin/tdefile_trash.h | 2 | ||||
-rw-r--r-- | tdeioslave/trash/tdeio_trash.cpp | 16 | ||||
-rw-r--r-- | tdeioslave/trash/tdeio_trash.h | 2 | ||||
-rw-r--r-- | tdeioslave/trash/testtrash.cpp | 12 | ||||
-rw-r--r-- | tdeioslave/trash/testtrash.h | 4 | ||||
-rw-r--r-- | tdeioslave/trash/trashimpl.cpp | 22 | ||||
-rw-r--r-- | tdeioslave/trash/trashimpl.h | 2 |
18 files changed, 53 insertions, 53 deletions
diff --git a/tdeioslave/trash/DESIGN b/tdeioslave/trash/DESIGN index 2bb6f19df..9420c53ce 100644 --- a/tdeioslave/trash/DESIGN +++ b/tdeioslave/trash/DESIGN @@ -13,7 +13,7 @@ BUGS TODO ==== -* Clean up konq_popupmenu.cc for Type=Link URL=trash:/ :( +* Clean up konq_popupmenu.cpp for Type=Link URL=trash:/ :( * Also, provide metainfo for trash contents for that desktop link. => maybe we need a new mimetype? Like application/x-trash-desktop, inheriting application/x-desktop. diff --git a/tdeioslave/trash/Makefile.am b/tdeioslave/trash/Makefile.am index 5d0d9b3e6..1c2ec23cc 100644 --- a/tdeioslave/trash/Makefile.am +++ b/tdeioslave/trash/Makefile.am @@ -31,7 +31,7 @@ testtrash_LDFLAGS = $(all_libraries) TESTS = testtrash messages: - $(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_trash.pot + $(XGETTEXT) `find . -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_trash.pot # ktrashpropsdlgplugin target noinst_HEADERS = ktrashpropsdlgplugin.h discspaceutil.h trash_constant.h diff --git a/tdeioslave/trash/discspaceutil.cpp b/tdeioslave/trash/discspaceutil.cpp index 186cb0e7f..e231b901c 100644 --- a/tdeioslave/trash/discspaceutil.cpp +++ b/tdeioslave/trash/discspaceutil.cpp @@ -102,9 +102,9 @@ void DiscSpaceUtil::done() void DiscSpaceUtil::calculateFullSize() { KDiskFreeSp *sp = KDiskFreeSp::findUsageInfo( mDirectory ); - connect( sp, TQT_SIGNAL( foundMountPoint( const TQString&, unsigned long, unsigned long, unsigned long ) ), - this, TQT_SLOT( foundMountPoint( const TQString&, unsigned long, unsigned long, unsigned long ) ) ); - connect( sp, TQT_SIGNAL( done() ), this, TQT_SLOT( done() ) ); + connect( sp, TQ_SIGNAL( foundMountPoint( const TQString&, unsigned long, unsigned long, unsigned long ) ), + this, TQ_SLOT( foundMountPoint( const TQString&, unsigned long, unsigned long, unsigned long ) ) ); + connect( sp, TQ_SIGNAL( done() ), this, TQ_SLOT( done() ) ); tqApp->eventLoop()->enterLoop(); } diff --git a/tdeioslave/trash/discspaceutil.h b/tdeioslave/trash/discspaceutil.h index a00141296..bcd8126e1 100644 --- a/tdeioslave/trash/discspaceutil.h +++ b/tdeioslave/trash/discspaceutil.h @@ -31,7 +31,7 @@ */ class DiscSpaceUtil : public TQObject { - Q_OBJECT + TQ_OBJECT public: /** diff --git a/tdeioslave/trash/kcmtrash.cpp b/tdeioslave/trash/kcmtrash.cpp index 4747e092a..06c458593 100644 --- a/tdeioslave/trash/kcmtrash.cpp +++ b/tdeioslave/trash/kcmtrash.cpp @@ -29,7 +29,7 @@ extern "C" { - KDE_EXPORT TDECModule *create_trash(TQWidget *parent, const char *) + TDE_EXPORT TDECModule *create_trash(TQWidget *parent, const char *) { return new TrashModule(parent, "kcmtrash"); } @@ -51,7 +51,7 @@ TrashModule::TrashModule(TQWidget *parent, const char *name) policyWidget = new KTrashPropsWidget(this); tab->addTab(policyWidget, i18n("&Trash Policy")); - connect(policyWidget, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool))); + connect(policyWidget, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool))); TQVBoxLayout *top = new TQVBoxLayout(this); top->addWidget(tab); diff --git a/tdeioslave/trash/kcmtrash.h b/tdeioslave/trash/kcmtrash.h index 4987ccfba..dc04b9587 100644 --- a/tdeioslave/trash/kcmtrash.h +++ b/tdeioslave/trash/kcmtrash.h @@ -27,7 +27,7 @@ class TQTabWidget; class TrashModule : public TDECModule { - Q_OBJECT + TQ_OBJECT public: TrashModule(TQWidget *parent, const char *name); diff --git a/tdeioslave/trash/ktrashpropsdlgplugin.cpp b/tdeioslave/trash/ktrashpropsdlgplugin.cpp index 067c10b6e..7b36aaaf4 100644 --- a/tdeioslave/trash/ktrashpropsdlgplugin.cpp +++ b/tdeioslave/trash/ktrashpropsdlgplugin.cpp @@ -74,7 +74,7 @@ KTrashPropsDlgPlugin::KTrashPropsDlgPlugin( KPropertiesDialog *dialog, const cha policyWidget = new KTrashPropsWidget(frame); TQVBoxLayout *vLayout = new TQVBoxLayout(frame, 0, 0); vLayout->addWidget(policyWidget); - connect(policyWidget, TQT_SIGNAL(changed(bool)), TQT_SLOT(setDirty())); + connect(policyWidget, TQ_SIGNAL(changed(bool)), TQ_SLOT(setDirty())); } KTrashPropsDlgPlugin::~KTrashPropsDlgPlugin() diff --git a/tdeioslave/trash/ktrashpropsdlgplugin.h b/tdeioslave/trash/ktrashpropsdlgplugin.h index b839f6428..b17c0d5f8 100644 --- a/tdeioslave/trash/ktrashpropsdlgplugin.h +++ b/tdeioslave/trash/ktrashpropsdlgplugin.h @@ -36,7 +36,7 @@ class KTrashPropsWidget; class KTrashPropsDlgPlugin : public KPropsDlgPlugin { - Q_OBJECT + TQ_OBJECT public: KTrashPropsDlgPlugin( KPropertiesDialog *dialog, const char*, const TQStringList& ); diff --git a/tdeioslave/trash/ktrashpropswidget.cpp b/tdeioslave/trash/ktrashpropswidget.cpp index 40e12cb4f..2040e9a76 100644 --- a/tdeioslave/trash/ktrashpropswidget.cpp +++ b/tdeioslave/trash/ktrashpropswidget.cpp @@ -50,15 +50,15 @@ KTrashPropsWidget::KTrashPropsWidget(TQWidget *parent, const char *name) mTrashImpl->init(); setupGui(); - connect(mUseTimeLimit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(useTypeChanged())); - connect(mDays, TQT_SIGNAL(valueChanged(int)),this, TQT_SLOT(setDirty())); - connect(mUseSizeLimit, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(useTypeChanged())); - connect(mPercentSize, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(percentSizeChanged(double))); - connect(mFixedSize, TQT_SIGNAL(valueChanged(double)), this, TQT_SLOT(fixedSizeChanged(double))); - connect(mFixedSizeUnit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(fixedSizeUnitActivated(int))); - connect(mRbPercentSize, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(rbPercentSizeToggled(bool))); - connect(mRbFixedSize, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(rbFixedSizeToggled(bool))); - connect(mLimitReachedAction, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setDirty())); + connect(mUseTimeLimit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(useTypeChanged())); + connect(mDays, TQ_SIGNAL(valueChanged(int)),this, TQ_SLOT(setDirty())); + connect(mUseSizeLimit, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(useTypeChanged())); + connect(mPercentSize, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(percentSizeChanged(double))); + connect(mFixedSize, TQ_SIGNAL(valueChanged(double)), this, TQ_SLOT(fixedSizeChanged(double))); + connect(mFixedSizeUnit, TQ_SIGNAL(activated(int)), this, TQ_SLOT(fixedSizeUnitActivated(int))); + connect(mRbPercentSize, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(rbPercentSizeToggled(bool))); + connect(mRbFixedSize, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(rbFixedSizeToggled(bool))); + connect(mLimitReachedAction, TQ_SIGNAL(activated(int)), this, TQ_SLOT(setDirty())); inhibitChangedSignal = true; load(); @@ -87,7 +87,7 @@ void KTrashPropsWidget::setupGui() mountPoints->insertItem(folderPixmap, util.mountPoint(), it.key()); } mountPoints->setCurrentItem(0); - connect(mountPoints, TQT_SIGNAL(highlighted(int)), TQT_SLOT(trashChanged(int))); + connect(mountPoints, TQ_SIGNAL(highlighted(int)), TQ_SLOT(trashChanged(int))); } mCurrentTrash = map[0]; diff --git a/tdeioslave/trash/ktrashpropswidget.h b/tdeioslave/trash/ktrashpropswidget.h index 8cebfcae4..ac131039b 100644 --- a/tdeioslave/trash/ktrashpropswidget.h +++ b/tdeioslave/trash/ktrashpropswidget.h @@ -32,7 +32,7 @@ class TrashImpl; class KTrashPropsWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: KTrashPropsWidget(TQWidget *parent=0, const char *name=0); diff --git a/tdeioslave/trash/tdefile-plugin/RETURNED_ITEMS b/tdeioslave/trash/tdefile-plugin/RETURNED_ITEMS index f4e10f262..7ada25041 100644 --- a/tdeioslave/trash/tdefile-plugin/RETURNED_ITEMS +++ b/tdeioslave/trash/tdefile-plugin/RETURNED_ITEMS @@ -1,4 +1,4 @@ tdefile_trash =========== -QString OriginalPath +TQString OriginalPath DateTime DateOfDeletion diff --git a/tdeioslave/trash/tdefile-plugin/tdefile_trash.h b/tdeioslave/trash/tdefile-plugin/tdefile_trash.h index fbd6c9e3d..afcbba1f1 100644 --- a/tdeioslave/trash/tdefile-plugin/tdefile_trash.h +++ b/tdeioslave/trash/tdefile-plugin/tdefile_trash.h @@ -28,7 +28,7 @@ class TQStringList; class KTrashPlugin: public KFilePlugin { - Q_OBJECT + TQ_OBJECT public: KTrashPlugin(TQObject *parent, const char *name, const TQStringList& args); diff --git a/tdeioslave/trash/tdeio_trash.cpp b/tdeioslave/trash/tdeio_trash.cpp index 90431afd5..ee48679d5 100644 --- a/tdeioslave/trash/tdeio_trash.cpp +++ b/tdeioslave/trash/tdeio_trash.cpp @@ -50,7 +50,7 @@ static const TDECmdLineOptions options[] = }; extern "C" { - int KDE_EXPORT kdemain( int argc, char **argv ) + int TDE_EXPORT kdemain( int argc, char **argv ) { //TDEInstance instance( "tdeio_trash" ); // TDEApplication is necessary to use tdeio_file @@ -435,7 +435,7 @@ bool TrashProtocol::createUDSEntry( const TQString& physicalPath, const TQString addAtom( entry, TDEIO::UDS_MODIFICATION_TIME, buff.st_mtime ); addAtom( entry, TDEIO::UDS_ACCESS_TIME, buff.st_atime ); // ## or use it for deletion time? addAtom( entry, TDEIO::UDS_EXTRA, 0, info.origPath ); - addAtom( entry, TDEIO::UDS_EXTRA, 0, info.deletionDate.toString( Qt::ISODate ) ); + addAtom( entry, TDEIO::UDS_EXTRA, 0, info.deletionDate.toString( TQt::ISODate ) ); return true; } @@ -533,12 +533,12 @@ void TrashProtocol::get( const KURL& url ) KURL fileURL; fileURL.setPath( physicalPath ); TDEIO::Job* job = TDEIO::get( fileURL ); - connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), - this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); - connect( job, TQT_SIGNAL( mimetype( TDEIO::Job*, const TQString& ) ), - this, TQT_SLOT( slotMimetype( TDEIO::Job*, const TQString& ) ) ); - connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( jobFinished(TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), + this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) ); + connect( job, TQ_SIGNAL( mimetype( TDEIO::Job*, const TQString& ) ), + this, TQ_SLOT( slotMimetype( TDEIO::Job*, const TQString& ) ) ); + connect( job, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( jobFinished(TDEIO::Job *) ) ); tqApp->eventLoop()->enterLoop(); } diff --git a/tdeioslave/trash/tdeio_trash.h b/tdeioslave/trash/tdeio_trash.h index 1f19927ca..5d16ce93a 100644 --- a/tdeioslave/trash/tdeio_trash.h +++ b/tdeioslave/trash/tdeio_trash.h @@ -30,7 +30,7 @@ typedef TrashImpl::TrashedFileInfoList TrashedFileInfoList; class TrashProtocol : public TQObject, public TDEIO::SlaveBase { - Q_OBJECT + TQ_OBJECT public: TrashProtocol( const TQCString& protocol, const TQCString &pool, const TQCString &app); virtual ~TrashProtocol(); diff --git a/tdeioslave/trash/testtrash.cpp b/tdeioslave/trash/testtrash.cpp index 60fe2d1a6..4a1ca12f8 100644 --- a/tdeioslave/trash/testtrash.cpp +++ b/tdeioslave/trash/testtrash.cpp @@ -1094,8 +1094,8 @@ void TestTrash::listRootDir() m_entryCount = 0; m_listResult.clear(); TDEIO::ListJob* job = TDEIO::listDir( "trash:/" ); - connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + connect( job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); kdDebug() << "listDir done - m_entryCount=" << m_entryCount << endl; @@ -1111,8 +1111,8 @@ void TestTrash::listRecursiveRootDir() m_entryCount = 0; m_listResult.clear(); TDEIO::ListJob* job = TDEIO::listRecursive( "trash:/" ); - connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + connect( job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); kdDebug() << "listDir done - m_entryCount=" << m_entryCount << endl; @@ -1128,8 +1128,8 @@ void TestTrash::listSubDir() m_entryCount = 0; m_listResult.clear(); TDEIO::ListJob* job = TDEIO::listDir( "trash:/0-trashDirFromHome" ); - connect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), - TQT_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); + connect( job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ), + TQ_SLOT( slotEntries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) ); bool ok = TDEIO::NetAccess::synchronousRun( job, 0 ); assert( ok ); kdDebug() << "listDir done - m_entryCount=" << m_entryCount << endl; diff --git a/tdeioslave/trash/testtrash.h b/tdeioslave/trash/testtrash.h index e87b9c3a0..1b46e3551 100644 --- a/tdeioslave/trash/testtrash.h +++ b/tdeioslave/trash/testtrash.h @@ -22,9 +22,9 @@ #include <tqobject.h> -class TestTrash : public QObject +class TestTrash : public TQObject { - Q_OBJECT + TQ_OBJECT public: TestTrash() {} diff --git a/tdeioslave/trash/trashimpl.cpp b/tdeioslave/trash/trashimpl.cpp index c2fc53352..8c062256c 100644 --- a/tdeioslave/trash/trashimpl.cpp +++ b/tdeioslave/trash/trashimpl.cpp @@ -130,7 +130,7 @@ bool TrashImpl::init() return false; // Check the trash directory and its info and files subdirs - // see also kdesktop/init.cc for first time initialization + // see also kdesktop/init.cpp for first time initialization m_initStatus = InitError; // $XDG_DATA_HOME/Trash, i.e. ~/.local/share/Trash by default. const TQString xdgDataDir = TDEGlobal::dirs()->localxdgdatadir(); @@ -263,7 +263,7 @@ bool TrashImpl::createInfo( const TQString& origPath, int& trashId, TQString& fi info += KURL::encode_string( makeRelativePath( topDirectoryPath( trashId ), origPath ), m_mibEnum ).latin1(); info += "\n"; info += "DeletionDate="; - info += TQDateTime::currentDateTime().toString( Qt::ISODate ).latin1(); + info += TQDateTime::currentDateTime().toString( TQt::ISODate ).latin1(); info += "\n"; size_t sz = info.size() - 1; // avoid trailing 0 from QCString @@ -374,8 +374,8 @@ bool TrashImpl::move( const TQString& src, const TQString& dest ) #ifdef TDEIO_COPYJOB_HAS_SETINTERACTIVE job->setInteractive( false ); #endif - connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( jobFinished(TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( jobFinished(TDEIO::Job *) ) ); tqApp->eventLoop()->enterLoop(); return m_lastErrorCode == 0; @@ -424,8 +424,8 @@ bool TrashImpl::copy( const TQString& src, const TQString& dest ) #ifdef TDEIO_COPYJOB_HAS_SETINTERACTIVE job->setInteractive( false ); #endif - connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), - this, TQT_SLOT( jobFinished( TDEIO::Job* ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), + this, TQ_SLOT( jobFinished( TDEIO::Job* ) ) ); tqApp->eventLoop()->enterLoop(); return m_lastErrorCode == 0; @@ -513,15 +513,15 @@ bool TrashImpl::synchronousDel( const TQString& path, bool setLastErrorCode, boo KFileItemList fileItemList; fileItemList.append( &fileItem ); TDEIO::ChmodJob* chmodJob = TDEIO::chmod( fileItemList, 0200, 0200, TQString::null, TQString::null, true /*recursive*/, false /*showProgressInfo*/ ); - connect( chmodJob, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( jobFinished(TDEIO::Job *) ) ); + connect( chmodJob, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( jobFinished(TDEIO::Job *) ) ); tqApp->eventLoop()->enterLoop(); } kdDebug() << k_funcinfo << "deleting " << url << endl; TDEIO::DeleteJob *job = TDEIO::del( url, false, false ); - connect( job, TQT_SIGNAL( result(TDEIO::Job *) ), - this, TQT_SLOT( jobFinished(TDEIO::Job *) ) ); + connect( job, TQ_SIGNAL( result(TDEIO::Job *) ), + this, TQ_SLOT( jobFinished(TDEIO::Job *) ) ); tqApp->eventLoop()->enterLoop(); bool ok = m_lastErrorCode == 0; if ( !setLastErrorCode ) { @@ -637,7 +637,7 @@ bool TrashImpl::readInfoFile( const TQString& infoPath, TrashedFileInfo& info, i } TQString line = cfg.readEntry( "DeletionDate" ); if ( !line.isEmpty() ) { - info.deletionDate = TQT_TQDATETIME_OBJECT(TQDateTime::fromString( line, Qt::ISODate )); + info.deletionDate = TQDateTime::fromString( line, TQt::ISODate ); } return true; } diff --git a/tdeioslave/trash/trashimpl.h b/tdeioslave/trash/trashimpl.h index 571bbd353..90032762d 100644 --- a/tdeioslave/trash/trashimpl.h +++ b/tdeioslave/trash/trashimpl.h @@ -33,7 +33,7 @@ */ class TrashImpl : public TQObject { - Q_OBJECT + TQ_OBJECT public: TrashImpl(); |