diff options
Diffstat (limited to 'tdefilereplace')
-rw-r--r-- | tdefilereplace/commandengine.cpp | 12 | ||||
-rw-r--r-- | tdefilereplace/commandengine.h | 2 | ||||
-rw-r--r-- | tdefilereplace/kaddstringdlg.cpp | 14 | ||||
-rw-r--r-- | tdefilereplace/kaddstringdlg.h | 2 | ||||
-rw-r--r-- | tdefilereplace/kaddstringdlgs.ui | 3 | ||||
-rw-r--r-- | tdefilereplace/knewprojectdlg.cpp | 44 | ||||
-rw-r--r-- | tdefilereplace/knewprojectdlg.h | 4 | ||||
-rw-r--r-- | tdefilereplace/knewprojectdlgs.ui | 9 | ||||
-rw-r--r-- | tdefilereplace/koptionsdlg.cpp | 14 | ||||
-rw-r--r-- | tdefilereplace/koptionsdlg.h | 4 | ||||
-rw-r--r-- | tdefilereplace/koptionsdlgs.ui | 9 | ||||
-rw-r--r-- | tdefilereplace/report.cpp | 4 | ||||
-rw-r--r-- | tdefilereplace/tdefilereplace.cpp | 12 | ||||
-rw-r--r-- | tdefilereplace/tdefilereplace.h | 2 | ||||
-rw-r--r-- | tdefilereplace/tdefilereplace.tdevelop | 190 | ||||
-rw-r--r-- | tdefilereplace/tdefilereplacelib.cpp | 4 | ||||
-rw-r--r-- | tdefilereplace/tdefilereplacepart.cpp | 86 | ||||
-rw-r--r-- | tdefilereplace/tdefilereplacepart.h | 2 | ||||
-rw-r--r-- | tdefilereplace/tdefilereplaceview.cpp | 52 | ||||
-rw-r--r-- | tdefilereplace/tdefilereplaceview.h | 2 |
20 files changed, 130 insertions, 341 deletions
diff --git a/tdefilereplace/commandengine.cpp b/tdefilereplace/commandengine.cpp index 5184773..99e1720 100644 --- a/tdefilereplace/commandengine.cpp +++ b/tdefilereplace/commandengine.cpp @@ -25,7 +25,7 @@ // KDE #include <kuser.h> #include <krandomsequence.h> -#include <kprocess.h> +#include <tdeprocess.h> // local #include "commandengine.h" @@ -34,9 +34,9 @@ TQString CommandEngine::datetime(const TQString& opt, const TQString& arg) { Q_UNUSED(arg); if(opt == "iso") - return TQDateTime::currentDateTime(Qt::LocalTime).toString(Qt::ISODate); + return TQDateTime::currentDateTime(TQt::LocalTime).toString(TQt::ISODate); if(opt == "local") - return TQDateTime::currentDateTime(Qt::LocalTime).toString(Qt::LocalDate); + return TQDateTime::currentDateTime(TQt::LocalTime).toString(TQt::LocalDate); return TQString(); } @@ -104,9 +104,9 @@ TQString CommandEngine::mathexp(const TQString& opt, const TQString& arg) *(proc) << script; - connect(proc, TQT_SIGNAL(receivedStdout(TDEProcess*,char*,int)), this, TQT_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); - connect(proc, TQT_SIGNAL(receivedStderr(TDEProcess*,char*,int)), this, TQT_SLOT(slotGetScriptError(TDEProcess*,char*,int))); - connect(proc, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited(TDEProcess*))); + connect(proc, TQ_SIGNAL(receivedStdout(TDEProcess*,char*,int)), this, TQ_SLOT(slotGetScriptOutput(TDEProcess*,char*,int))); + connect(proc, TQ_SIGNAL(receivedStderr(TDEProcess*,char*,int)), this, TQ_SLOT(slotGetScriptError(TDEProcess*,char*,int))); + connect(proc, TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(slotProcessExited(TDEProcess*))); //Through slotGetScriptOutput, m_processOutput contains the result of the TDEProcess call if(!proc->start(TDEProcess::Block, TDEProcess::All)) diff --git a/tdefilereplace/commandengine.h b/tdefilereplace/commandengine.h index 36bcfcb..ad14578 100644 --- a/tdefilereplace/commandengine.h +++ b/tdefilereplace/commandengine.h @@ -28,7 +28,7 @@ class TDEProcess; class CommandEngine : public TQObject { - Q_OBJECT + TQ_OBJECT private: TQString m_processOutput; diff --git a/tdefilereplace/kaddstringdlg.cpp b/tdefilereplace/kaddstringdlg.cpp index ba76c8c..996abdf 100644 --- a/tdefilereplace/kaddstringdlg.cpp +++ b/tdefilereplace/kaddstringdlg.cpp @@ -44,12 +44,12 @@ KAddStringDlg::KAddStringDlg(RCOptions* info, TQWidget *parent, const char *name initGUI(); - connect(m_pbOK, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOK())); - connect(m_rbSearchOnly, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotSearchOnly())); - connect(m_rbSearchReplace, TQT_SIGNAL(pressed()), this, TQT_SLOT(slotSearchReplace())); - connect(m_pbAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAddStringToView())); - connect(m_pbDel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDeleteStringFromView())); - connect(m_pbHelp, TQT_SIGNAL(clicked()), this ,TQT_SLOT(slotHelp())); + connect(m_pbOK, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOK())); + connect(m_rbSearchOnly, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotSearchOnly())); + connect(m_rbSearchReplace, TQ_SIGNAL(pressed()), this, TQ_SLOT(slotSearchReplace())); + connect(m_pbAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAddStringToView())); + connect(m_pbDel, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDeleteStringFromView())); + connect(m_pbHelp, TQ_SIGNAL(clicked()), this ,TQ_SLOT(slotHelp())); whatsThis(); } @@ -244,7 +244,7 @@ void KAddStringDlg::slotDeleteStringFromView() void KAddStringDlg::slotHelp() { - kapp->invokeHelp(TQString(), "tdefilereplace"); + tdeApp->invokeHelp(TQString(), "tdefilereplace"); } #include "kaddstringdlg.moc" diff --git a/tdefilereplace/kaddstringdlg.h b/tdefilereplace/kaddstringdlg.h index 276573e..6ca518c 100644 --- a/tdefilereplace/kaddstringdlg.h +++ b/tdefilereplace/kaddstringdlg.h @@ -27,7 +27,7 @@ */ class KAddStringDlg : public KAddStringDlgS { - Q_OBJECT + TQ_OBJECT private: RCOptions* m_option; diff --git a/tdefilereplace/kaddstringdlgs.ui b/tdefilereplace/kaddstringdlgs.ui index 563aa33..87098c8 100644 --- a/tdefilereplace/kaddstringdlgs.ui +++ b/tdefilereplace/kaddstringdlgs.ui @@ -51,9 +51,6 @@ <property name="text"> <string>Search and replace mode</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQRadioButton" row="0" column="0"> <property name="name"> diff --git a/tdefilereplace/knewprojectdlg.cpp b/tdefilereplace/knewprojectdlg.cpp index 5119d2c..0a6873f 100644 --- a/tdefilereplace/knewprojectdlg.cpp +++ b/tdefilereplace/knewprojectdlg.cpp @@ -38,7 +38,7 @@ #include <tdeglobal.h> #include <tdelocale.h> #include <kpushbutton.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeversion.h> #include <kiconloader.h> #include <kdebug.h> @@ -58,23 +58,23 @@ KNewProjectDlg::KNewProjectDlg(RCOptions* info, TQWidget *parent, const char *na initGUI(); - connect(m_chbIncludeSubfolders, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableMaxDepthControls(bool))); - connect(m_chbLimitDepth, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableSpinboxMaxDepth(bool))); - connect(m_pbLocation, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotDir())); - connect(m_pbCancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotReject())); - connect(m_pbSearchNow, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSearchNow())); - connect(m_pbSearchLater, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSearchLater())); - connect(m_cbSearch, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotSearchLineEdit(const TQString&))); - connect(m_chbSizeMin, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableSpinboxSizeMin(bool))); - connect(m_chbSizeMax, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableSpinboxSizeMax(bool))); - connect(m_chbDateMin, TQT_SIGNAL(toggled(bool)), m_dedDateMin, TQT_SLOT(setEnabled(bool))); - connect(m_chbDateMax, TQT_SIGNAL(toggled(bool)), m_dedDateMax, TQT_SLOT(setEnabled(bool))); - connect(m_chbDateMin,TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(slotEnableCbValidDate(bool))); - connect(m_chbDateMax,TQT_SIGNAL(toggled(bool)),this, TQT_SLOT(slotEnableCbValidDate(bool))); - connect(m_chbOwnerUser, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableChbUser(bool))); - connect(m_chbOwnerGroup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableChbGroup(bool))); - connect(m_chbBackup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotEnableChbBackup(bool))); - connect(m_pbHelp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHelp())); + connect(m_chbIncludeSubfolders, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableMaxDepthControls(bool))); + connect(m_chbLimitDepth, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableSpinboxMaxDepth(bool))); + connect(m_pbLocation, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotDir())); + connect(m_pbCancel, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotReject())); + connect(m_pbSearchNow, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSearchNow())); + connect(m_pbSearchLater, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSearchLater())); + connect(m_cbSearch, TQ_SIGNAL(textChanged(const TQString&)), this, TQ_SLOT(slotSearchLineEdit(const TQString&))); + connect(m_chbSizeMin, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableSpinboxSizeMin(bool))); + connect(m_chbSizeMax, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableSpinboxSizeMax(bool))); + connect(m_chbDateMin, TQ_SIGNAL(toggled(bool)), m_dedDateMin, TQ_SLOT(setEnabled(bool))); + connect(m_chbDateMax, TQ_SIGNAL(toggled(bool)), m_dedDateMax, TQ_SLOT(setEnabled(bool))); + connect(m_chbDateMin,TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(slotEnableCbValidDate(bool))); + connect(m_chbDateMax,TQ_SIGNAL(toggled(bool)),this, TQ_SLOT(slotEnableCbValidDate(bool))); + connect(m_chbOwnerUser, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableChbUser(bool))); + connect(m_chbOwnerGroup, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableChbGroup(bool))); + connect(m_chbBackup, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotEnableChbBackup(bool))); + connect(m_pbHelp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotHelp())); whatsThis(); } @@ -315,7 +315,7 @@ void KNewProjectDlg::loadDateAccessOptions() else { m_chbDateMin->setChecked(true); - m_dedDateMin->setDate(TQDate::fromString(date,Qt::ISODate)); + m_dedDateMin->setDate(TQDate::fromString(date,TQt::ISODate)); m_dedDateMin->setEnabled(true); } @@ -329,7 +329,7 @@ void KNewProjectDlg::loadDateAccessOptions() else { m_chbDateMax->setChecked(true); - m_dedDateMax->setDate(TQDate::fromString(date,Qt::ISODate)); + m_dedDateMax->setDate(TQDate::fromString(date,TQt::ISODate)); m_dedDateMax->setEnabled(true); } @@ -420,7 +420,7 @@ void KNewProjectDlg::saveDateAccessOptions() if(m_chbDateMin->isChecked()) { - TQString date = m_dedDateMin->date().toString(Qt::ISODate); + TQString date = m_dedDateMin->date().toString(TQt::ISODate); m_option->m_minDate = date; } else @@ -428,7 +428,7 @@ void KNewProjectDlg::saveDateAccessOptions() if(m_chbDateMax->isChecked()) { - TQString date = m_dedDateMax->date().toString(Qt::ISODate); + TQString date = m_dedDateMax->date().toString(TQt::ISODate); m_option->m_maxDate = date; } else diff --git a/tdefilereplace/knewprojectdlg.h b/tdefilereplace/knewprojectdlg.h index 82e65e6..08a307e 100644 --- a/tdefilereplace/knewprojectdlg.h +++ b/tdefilereplace/knewprojectdlg.h @@ -28,7 +28,7 @@ class TDEConfig; class KNewProjectDlg : public KNewProjectDlgS { - Q_OBJECT + TQ_OBJECT private: @@ -58,7 +58,7 @@ class KNewProjectDlg : public KNewProjectDlgS void slotEnableChbUser(bool b); void slotEnableChbGroup(bool b); void slotEnableChbBackup(bool b); - void slotHelp(){ kapp->invokeHelp(TQString(), "tdefilereplace"); } + void slotHelp(){ tdeApp->invokeHelp(TQString(), "tdefilereplace"); } private: void initGUI(); diff --git a/tdefilereplace/knewprojectdlgs.ui b/tdefilereplace/knewprojectdlgs.ui index 84f6150..dbf78ff 100644 --- a/tdefilereplace/knewprojectdlgs.ui +++ b/tdefilereplace/knewprojectdlgs.ui @@ -88,9 +88,6 @@ <property name="text"> <string>Search Now</string> </property> - <property name="accel"> - <string></string> - </property> <property name="default"> <bool>true</bool> </property> @@ -102,9 +99,6 @@ <property name="text"> <string>Search Later</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="KPushButton"> <property name="name"> @@ -219,9 +213,6 @@ <property name="text"> <string></string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="KComboBox" row="1" column="1" rowspan="1" colspan="2"> <property name="name"> diff --git a/tdefilereplace/koptionsdlg.cpp b/tdefilereplace/koptionsdlg.cpp index 748c925..1e345bc 100644 --- a/tdefilereplace/koptionsdlg.cpp +++ b/tdefilereplace/koptionsdlg.cpp @@ -29,7 +29,7 @@ #include <kcombobox.h> #include <tdeconfig.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeapplication.h> //#include <kdebug.h> @@ -48,12 +48,12 @@ KOptionsDlg::KOptionsDlg(RCOptions* info, TQWidget *parent, const char *name) : initGUI(); - connect(m_pbOK, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotOK())); - connect(m_pbDefault, TQT_SIGNAL(clicked()),this,TQT_SLOT(slotDefaults())); - connect(m_chbBackup, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChbBackup(bool))); - connect(m_pbHelp, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHelp())); - connect(m_chbConfirmStrings, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChbConfirmStrings(bool))); - connect(m_chbShowConfirmDialog, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotChbShowConfirmDialog(bool))); + connect(m_pbOK, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotOK())); + connect(m_pbDefault, TQ_SIGNAL(clicked()),this,TQ_SLOT(slotDefaults())); + connect(m_chbBackup, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChbBackup(bool))); + connect(m_pbHelp, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotHelp())); + connect(m_chbConfirmStrings, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChbConfirmStrings(bool))); + connect(m_chbShowConfirmDialog, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotChbShowConfirmDialog(bool))); whatsThis(); } diff --git a/tdefilereplace/koptionsdlg.h b/tdefilereplace/koptionsdlg.h index 78375e5..f2289ba 100644 --- a/tdefilereplace/koptionsdlg.h +++ b/tdefilereplace/koptionsdlg.h @@ -32,7 +32,7 @@ class TDEConfig; class KOptionsDlg : public KOptionsDlgS { - Q_OBJECT + TQ_OBJECT public: KOptionsDlg(RCOptions* info, TQWidget *parent, const char *name); @@ -48,7 +48,7 @@ class KOptionsDlg : public KOptionsDlgS void slotChbBackup(bool b); void slotChbConfirmStrings(bool b); void slotChbShowConfirmDialog(bool b); - void slotHelp(){ kapp->invokeHelp(TQString(), "tdefilereplace"); } + void slotHelp(){ tdeApp->invokeHelp(TQString(), "tdefilereplace"); } private: void initGUI(); diff --git a/tdefilereplace/koptionsdlgs.ui b/tdefilereplace/koptionsdlgs.ui index 196ad2c..dde7725 100644 --- a/tdefilereplace/koptionsdlgs.ui +++ b/tdefilereplace/koptionsdlgs.ui @@ -55,9 +55,6 @@ <property name="text"> <string>Enable commands in replace strings</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQLabel" row="7" column="0"> <property name="name"> @@ -90,9 +87,6 @@ <property name="text"> <string>Case sensitive</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> @@ -101,9 +95,6 @@ <property name="text"> <string>Recursive (search/replace in all sub folders)</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> diff --git a/tdefilereplace/report.cpp b/tdefilereplace/report.cpp index 3be703e..6a8f6b5 100644 --- a/tdefilereplace/report.cpp +++ b/tdefilereplace/report.cpp @@ -44,8 +44,8 @@ void Report::createReportFile() // b) Write the header of the XML file - TQDateTime datetime = TQDateTime::currentDateTime(Qt::LocalTime); - TQString dateString = datetime.toString(Qt::LocalDate); + TQDateTime datetime = TQDateTime::currentDateTime(TQt::LocalTime); + TQString dateString = datetime.toString(TQt::LocalDate); KUser user; TQString columnTextFour, columnReplaceWith; diff --git a/tdefilereplace/tdefilereplace.cpp b/tdefilereplace/tdefilereplace.cpp index 8cb7d33..e88d4c5 100644 --- a/tdefilereplace/tdefilereplace.cpp +++ b/tdefilereplace/tdefilereplace.cpp @@ -30,15 +30,15 @@ TDEFileReplace::TDEFileReplace() KLibFactory *factory = KLibLoader::self()->factory("libtdefilereplacepart"); if (factory) { - m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(TQT_TQOBJECT(this), + m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this, "tdefilereplace_part", "KParts::ReadOnlyPart" )); if (m_part) { setCentralWidget(m_part->widget()); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbars()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(slotConfigureToolbars()), actionCollection()); setStandardToolBarMenuEnabled(true); createGUI(m_part); removeDuplicatedActions(); @@ -78,8 +78,8 @@ void TDEFileReplace::slotConfigureToolbars() { saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } diff --git a/tdefilereplace/tdefilereplace.h b/tdefilereplace/tdefilereplace.h index 2742a5c..73256ee 100644 --- a/tdefilereplace/tdefilereplace.h +++ b/tdefilereplace/tdefilereplace.h @@ -25,7 +25,7 @@ Shell application for the TDEFileReplace part. */ class TDEFileReplace : public KParts::MainWindow { - Q_OBJECT + TQ_OBJECT public: TDEFileReplace(); diff --git a/tdefilereplace/tdefilereplace.tdevelop b/tdefilereplace/tdefilereplace.tdevelop deleted file mode 100644 index 9bf175a..0000000 --- a/tdefilereplace/tdefilereplace.tdevelop +++ /dev/null @@ -1,190 +0,0 @@ -<?xml version = '1.0'?> -<tdevelop> - <general> - <author/> - <email/> - <version>$VERSION$</version> - <projectmanagement>KDevKDEAutoProject</projectmanagement> - <primarylanguage>C++</primarylanguage> - <keywords> - <keyword>Qt</keyword> - <keyword>KDE</keyword> - </keywords> - <projectdirectory>.</projectdirectory> - <absoluteprojectpath>false</absoluteprojectpath> - <description/> - <ignoreparts/> - <secondaryLanguages/> - <versioncontrol>tdevcvsservice</versioncontrol> - </general> - <tdevfileview> - <groups> - <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> - <group pattern="*.ui" name="User Interface" /> - <group pattern="*.png" name="Icons" /> - <group pattern="*.po;*.ts" name="Translations" /> - <group pattern="*" name="Others" /> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidenonlocation>false</hidenonlocation> - </groups> - <tree> - <showvcsfields>false</showvcsfields> - <hidenonprojectfiles>false</hidenonprojectfiles> - <hidepatterns>*.o,*.lo,CVS</hidepatterns> - </tree> - </tdevfileview> - <tdevdoctreeview> - <ignoretocs> - <toc>ada</toc> - <toc>ada_bugs_gcc</toc> - <toc>bash</toc> - <toc>bash_bugs</toc> - <toc>clanlib</toc> - <toc>fortran_bugs_gcc</toc> - <toc>gnome1</toc> - <toc>gnustep</toc> - <toc>gtk</toc> - <toc>gtk_bugs</toc> - <toc>haskell</toc> - <toc>haskell_bugs_ghc</toc> - <toc>java_bugs_gcc</toc> - <toc>java_bugs_sun</toc> - <toc>opengl</toc> - <toc>pascal_bugs_fp</toc> - <toc>php</toc> - <toc>php_bugs</toc> - <toc>perl</toc> - <toc>perl_bugs</toc> - <toc>python</toc> - <toc>python_bugs</toc> - <toc>ruby</toc> - <toc>ruby_bugs</toc> - <toc>sdl</toc> - <toc>stl</toc> - <toc>sw</toc> - <toc>w3c-dom-level2-html</toc> - <toc>w3c-svg</toc> - <toc>w3c-uaag10</toc> - <toc>wxwidgets_bugs</toc> - </ignoretocs> - <ignoreqt_xml> - <toc>qmake User Guide</toc> - </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> - <general> - <dbgshell>libtool</dbgshell> - <programargs/> - <gdbpath/> - <configGdbScript/> - <runShellScript/> - <runGdbScript/> - <breakonloadinglibs>true</breakonloadinglibs> - <separatetty>false</separatetty> - <floatingtoolbar>false</floatingtoolbar> - </general> - <display> - <staticmembers>false</staticmembers> - <demanglenames>true</demanglenames> - <outputradix>10</outputradix> - </display> - </tdevdebugger> - <tdevfilecreate> - <filetypes/> - <useglobaltypes> - <type ext="ui" /> - <type ext="cpp" /> - <type ext="h" /> - </useglobaltypes> - </tdevfilecreate> - <tdevautoproject> - <make> - <envvars> - <envvar value="1" name="WANT_AUTOCONF_2_5" /> - <envvar value="1" name="WANT_AUTOMAKE_1_6" /> - </envvars> - <abortonerror>true</abortonerror> - <numberofjobs>1</numberofjobs> - <dontact>false</dontact> - <makebin/> - <prio>0</prio> - </make> - <run> - <directoryradio>build</directoryradio> - <customdirectory>/</customdirectory> - <mainprogram>tdefilereplace/tdefilereplace</mainprogram> - <programargs/> - <terminal>false</terminal> - <autocompile>true</autocompile> - <envvars/> - </run> - <general> - <useconfiguration>default</useconfiguration> - <activetarget>tdefilereplace</activetarget> - </general> - <configurations> - <default> - <envvars> - <envvar value="kommander klinkstatus kxsldbg kimagemapeditor quanta" name="DO_NOT_COMPILE" /> - </envvars> - <configargs>--enable-debug=full --prefix=/opt/trinity --enable-editors</configargs> - <builddir>/home/andris/development/build/kde-head/tdewebdev</builddir> - <topsourcedir>/home/andris/development/sources/kde-head/tdewebdev</topsourcedir> - <cppflags>-DKDE_NO_COMPAT -DTQT_NO_COMPAT -DDEBUG_PARSER</cppflags> - <ldflags/> - <ccompiler>tdevgccoptions</ccompiler> - <cxxcompiler>tdevgppoptions</cxxcompiler> - <f77compiler>tdevpgf77options</f77compiler> - <ccompilerbinary/> - <cxxcompilerbinary/> - <f77compilerbinary/> - <cflags/> - <cxxflags/> - <f77flags/> - </default> - </configurations> - </tdevautoproject> - <cppsupportpart> - <filetemplates> - <interfacesuffix>.h</interfacesuffix> - <implementationsuffix>.cpp</implementationsuffix> - </filetemplates> - </cppsupportpart> - <tdevcppsupport> - <codecompletion> - <includeGlobalFunctions>true</includeGlobalFunctions> - <includeTypes>true</includeTypes> - <includeEnums>true</includeEnums> - <includeTypedefs>false</includeTypedefs> - <automaticCodeCompletion>true</automaticCodeCompletion> - <automaticArgumentsHint>true</automaticArgumentsHint> - <automaticHeaderCompletion>true</automaticHeaderCompletion> - <codeCompletionDelay>250</codeCompletionDelay> - <argumentsHintDelay>400</argumentsHintDelay> - <headerCompletionDelay>250</headerCompletionDelay> - </codecompletion> - <references/> - <creategettersetter> - <prefixGet/> - <prefixSet>set</prefixSet> - <prefixVariable>m_,_</prefixVariable> - <parameterName>theValue</parameterName> - <inlineGet>true</inlineGet> - <inlineSet>true</inlineSet> - </creategettersetter> - </tdevcppsupport> - <tdevdocumentation> - <projectdoc> - <docsystem/> - <docurl/> - <usermanualurl/> - </projectdoc> - </tdevdocumentation> - <tdevcvsservice> - <recursivewhenupdate>true</recursivewhenupdate> - <prunedirswhenupdate>true</prunedirswhenupdate> - <createdirswhenupdate>true</createdirswhenupdate> - <recursivewhencommitremove>true</recursivewhencommitremove> - <revertoptions>-C</revertoptions> - </tdevcvsservice> -</tdevelop> diff --git a/tdefilereplace/tdefilereplacelib.cpp b/tdefilereplace/tdefilereplacelib.cpp index 90c8ef4..33e0bb3 100644 --- a/tdefilereplace/tdefilereplacelib.cpp +++ b/tdefilereplace/tdefilereplacelib.cpp @@ -118,9 +118,9 @@ bool TDEFileReplaceLib::isAnAccessibleFile(const TQString& filePath, const TQStr // Avoid files that not match access date requirements TQString last = "unknown"; if(dateAccess == "Last Writing Access") - last = fi.lastModified().toString(Qt::ISODate); + last = fi.lastModified().toString(TQt::ISODate); if(dateAccess == "Last Reading Access") - last = fi.lastRead().toString(Qt::ISODate); + last = fi.lastRead().toString(TQt::ISODate); if(last != "unknown") { diff --git a/tdefilereplace/tdefilereplacepart.cpp b/tdefilereplace/tdefilereplacepart.cpp index 14d9ff3..c3c4b82 100644 --- a/tdefilereplace/tdefilereplacepart.cpp +++ b/tdefilereplace/tdefilereplacepart.cpp @@ -28,12 +28,12 @@ #include <kbugreport.h> #include <tdeconfig.h> #include <tdefiledialog.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeio/netaccess.h> #include <tdelocale.h> #include <tdemessagebox.h> #include <tdeparts/genericfactory.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <tdeglobal.h> #include <kiconeffect.h> @@ -143,7 +143,7 @@ void TDEFileReplacePart::slotSearchingOperation() m_view->showSemaphore("yellow"); - kapp->processEvents(); + tdeApp->processEvents(); //disabling and enabling sorting... don't ask me why, but it works! rv->setSorting(0); @@ -377,7 +377,7 @@ void TDEFileReplacePart::showAboutApplication() void TDEFileReplacePart::appHelpActivated() { - kapp->invokeHelp(TQString(), "tdefilereplace"); + tdeApp->invokeHelp(TQString(), "tdefilereplace"); } void TDEFileReplacePart::reportBug() @@ -493,7 +493,7 @@ void TDEFileReplacePart::initGUI() actionCollection()->setHighlightingEnabled(true); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); QCStringList appList = client->registeredApplications(); bool quantaFound = false; for(QCStringList::Iterator it = appList.begin(); it != appList.end(); ++it) @@ -506,53 +506,53 @@ void TDEFileReplacePart::initGUI() } // GUI - connect(m_view, TQT_SIGNAL(updateGUI()), this, TQT_SLOT(updateGUI())); + connect(m_view, TQ_SIGNAL(updateGUI()), this, TQ_SLOT(updateGUI())); // File - (void)new TDEAction(i18n("Customize Search/Replace Session..."), "projectopen", TDEShortcut(CTRL + Key_F), TQT_TQOBJECT(this), TQT_SLOT(slotSetNewParameters()), actionCollection(), "new_project"); - (void)new TDEAction(i18n("&Search"), "filesearch", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSearchingOperation()), actionCollection(), "search"); - (void)new TDEAction(i18n("S&imulate"), "filesimulate", 0, TQT_TQOBJECT(this), TQT_SLOT(slotSimulatingOperation()), actionCollection(), "file_simulate"); - (void)new TDEAction(i18n("&Replace"), "filereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(slotReplacingOperation()), actionCollection(), "replace"); - (void)new TDEAction(i18n("Sto&p"), "process-stop", 0, TQT_TQOBJECT(this), TQT_SLOT(slotStop()), actionCollection(), "stop"); - (void)new TDEAction(i18n("Cre&ate Report File..."), "document-save-as", 0, TQT_TQOBJECT(this), TQT_SLOT(slotCreateReport()), actionCollection(), "results_create_report"); - (void)new TDEAction(i18n("&Save Results List to File..."), "document-save-as", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultSave()), actionCollection(), "results_save"); - (void)new TDEAction(i18n("&Load Results List From File..."), "unsortedList", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultLoad()), actionCollection(), "results_load"); + (void)new TDEAction(i18n("Customize Search/Replace Session..."), "projectopen", TDEShortcut(CTRL + Key_F), this, TQ_SLOT(slotSetNewParameters()), actionCollection(), "new_project"); + (void)new TDEAction(i18n("&Search"), "filesearch", 0, this, TQ_SLOT(slotSearchingOperation()), actionCollection(), "search"); + (void)new TDEAction(i18n("S&imulate"), "filesimulate", 0, this, TQ_SLOT(slotSimulatingOperation()), actionCollection(), "file_simulate"); + (void)new TDEAction(i18n("&Replace"), "filereplace", 0, this, TQ_SLOT(slotReplacingOperation()), actionCollection(), "replace"); + (void)new TDEAction(i18n("Sto&p"), "process-stop", 0, this, TQ_SLOT(slotStop()), actionCollection(), "stop"); + (void)new TDEAction(i18n("Cre&ate Report File..."), "document-save-as", 0, this, TQ_SLOT(slotCreateReport()), actionCollection(), "results_create_report"); + (void)new TDEAction(i18n("&Save Results List to File..."), "document-save-as", 0, m_view, TQ_SLOT(slotResultSave()), actionCollection(), "results_save"); + (void)new TDEAction(i18n("&Load Results List From File..."), "unsortedList", 0, m_view, TQ_SLOT(slotResultLoad()), actionCollection(), "results_load"); // Strings - (void)new TDEAction(i18n("&Add String..."), "editadd", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsAdd()), actionCollection(), "strings_add"); - (void)new TDEAction(i18n("&Delete String"), "editremove", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsDeleteItem()), actionCollection(), "strings_del"); - (void)new TDEAction(i18n("&Empty Strings List"), "edit-delete", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsEmpty()), actionCollection(), "strings_empty"); - (void)new TDEAction(i18n("&Save Strings List to File..."), "document-save-as", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsSave()), actionCollection(), "strings_save"); - (void)new TDEAction(i18n("&Load Strings List From File..."), "unsortedList", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsLoad()), actionCollection(), "strings_load"); - (void)new TDEAction(i18n("&Invert Current String (search <--> replace)"), "invert", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsInvertCur()), actionCollection(), "strings_invert"); - (void)new TDEAction(i18n("&Invert All Strings (search <--> replace)"), "invert", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotStringsInvertAll()), actionCollection(), "strings_invert_all"); + (void)new TDEAction(i18n("&Add String..."), "editadd", 0, m_view, TQ_SLOT(slotStringsAdd()), actionCollection(), "strings_add"); + (void)new TDEAction(i18n("&Delete String"), "editremove", 0, m_view, TQ_SLOT(slotStringsDeleteItem()), actionCollection(), "strings_del"); + (void)new TDEAction(i18n("&Empty Strings List"), "edit-delete", 0, m_view, TQ_SLOT(slotStringsEmpty()), actionCollection(), "strings_empty"); + (void)new TDEAction(i18n("&Save Strings List to File..."), "document-save-as", 0, m_view, TQ_SLOT(slotStringsSave()), actionCollection(), "strings_save"); + (void)new TDEAction(i18n("&Load Strings List From File..."), "unsortedList", 0, m_view, TQ_SLOT(slotStringsLoad()), actionCollection(), "strings_load"); + (void)new TDEAction(i18n("&Invert Current String (search <--> replace)"), "invert", 0, m_view, TQ_SLOT(slotStringsInvertCur()), actionCollection(), "strings_invert"); + (void)new TDEAction(i18n("&Invert All Strings (search <--> replace)"), "invert", 0, m_view, TQ_SLOT(slotStringsInvertAll()), actionCollection(), "strings_invert_all"); // Options - (void)new TDEToggleAction(i18n("&Include Sub-Folders"), "recursive_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionRecursive()), actionCollection(), "options_recursive"); - (void)new TDEToggleAction(i18n("Create &Backup Files"), "backup_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionBackup()), actionCollection(), "options_backup"); - (void)new TDEToggleAction(i18n("Case &Sensitive"), "casesensitive_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionCaseSensitive()), actionCollection(), "options_case"); - (void)new TDEToggleAction(i18n("Enable Commands &in Replace String: [$command:option$]"), "command_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionVariables()), actionCollection(), "options_var"); - (void)new TDEToggleAction(i18n("Enable &Regular Expressions"), "regularexpression_option", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionRegularExpressions()), actionCollection(), "options_regularexpressions"); - (void)new TDEAction(i18n("Configure &TDEFileReplace..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotOptionPreferences()), actionCollection(), "configure_tdefilereplace"); + (void)new TDEToggleAction(i18n("&Include Sub-Folders"), "recursive_option", 0, this, TQ_SLOT(slotOptionRecursive()), actionCollection(), "options_recursive"); + (void)new TDEToggleAction(i18n("Create &Backup Files"), "backup_option", 0, this, TQ_SLOT(slotOptionBackup()), actionCollection(), "options_backup"); + (void)new TDEToggleAction(i18n("Case &Sensitive"), "casesensitive_option", 0, this, TQ_SLOT(slotOptionCaseSensitive()), actionCollection(), "options_case"); + (void)new TDEToggleAction(i18n("Enable Commands &in Replace String: [$command:option$]"), "command_option", 0, this, TQ_SLOT(slotOptionVariables()), actionCollection(), "options_var"); + (void)new TDEToggleAction(i18n("Enable &Regular Expressions"), "regularexpression_option", 0, this, TQ_SLOT(slotOptionRegularExpressions()), actionCollection(), "options_regularexpressions"); + (void)new TDEAction(i18n("Configure &TDEFileReplace..."), "configure", 0, this, TQ_SLOT(slotOptionPreferences()), actionCollection(), "configure_tdefilereplace"); // Results - (void)new TDEAction(i18n("&Properties"), "informations", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultProperties()), actionCollection(), "results_infos"); - (void)new TDEAction(i18n("&Open"), "document-open", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultOpen()), actionCollection(), "results_openfile"); - (void)new TDEAction(i18n("Open &With..."), "document-open", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultOpenWith()), actionCollection(), "results_openfilewith"); + (void)new TDEAction(i18n("&Properties"), "informations", 0, m_view, TQ_SLOT(slotResultProperties()), actionCollection(), "results_infos"); + (void)new TDEAction(i18n("&Open"), "document-open", 0, m_view, TQ_SLOT(slotResultOpen()), actionCollection(), "results_openfile"); + (void)new TDEAction(i18n("Open &With..."), "document-open", 0, m_view, TQ_SLOT(slotResultOpenWith()), actionCollection(), "results_openfilewith"); if(quantaFound) { - (void)new TDEAction(i18n("&Edit in Quanta"), "quanta", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultEdit()), actionCollection(), "results_editfile"); + (void)new TDEAction(i18n("&Edit in Quanta"), "quanta", 0, m_view, TQ_SLOT(slotResultEdit()), actionCollection(), "results_editfile"); } - (void)new TDEAction(i18n("Open Parent &Folder"), "go-up", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDirOpen()), actionCollection(), "results_opendir"); - (void)new TDEAction(i18n("Remove &Entry"), "edit-clear", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultRemoveEntry()), actionCollection(), "results_removeentry"); - (void)new TDEAction(i18n("&Delete"), "edit-delete", 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultDelete()), actionCollection(), "results_delete"); - (void)new TDEAction(i18n("E&xpand Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeExpand()), actionCollection(), "results_treeexpand"); - (void)new TDEAction(i18n("&Reduce Tree"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(slotResultTreeReduce()), actionCollection(), "results_treereduce"); + (void)new TDEAction(i18n("Open Parent &Folder"), "go-up", 0, m_view, TQ_SLOT(slotResultDirOpen()), actionCollection(), "results_opendir"); + (void)new TDEAction(i18n("Remove &Entry"), "edit-clear", 0, m_view, TQ_SLOT(slotResultRemoveEntry()), actionCollection(), "results_removeentry"); + (void)new TDEAction(i18n("&Delete"), "edit-delete", 0, m_view, TQ_SLOT(slotResultDelete()), actionCollection(), "results_delete"); + (void)new TDEAction(i18n("E&xpand Tree"), 0, m_view, TQ_SLOT(slotResultTreeExpand()), actionCollection(), "results_treeexpand"); + (void)new TDEAction(i18n("&Reduce Tree"), 0, m_view, TQ_SLOT(slotResultTreeReduce()), actionCollection(), "results_treereduce"); // Help - (void)new TDEAction(i18n("&About TDEFileReplace"), "tdefilereplace", 0, TQT_TQOBJECT(this), TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdefilereplace"); - (void)new TDEAction(i18n("TDEFileReplace &Handbook"), "help", 0, TQT_TQOBJECT(this), TQT_SLOT(appHelpActivated()), actionCollection(), "help_tdefilereplace"); - (void)new TDEAction(i18n("&Report Bug"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(reportBug()), actionCollection(), "report_bug"); + (void)new TDEAction(i18n("&About TDEFileReplace"), "tdefilereplace", 0, this, TQ_SLOT(showAboutApplication()), actionCollection(), "help_about_tdefilereplace"); + (void)new TDEAction(i18n("TDEFileReplace &Handbook"), "help", 0, this, TQ_SLOT(appHelpActivated()), actionCollection(), "help_tdefilereplace"); + (void)new TDEAction(i18n("&Report Bug"), 0, 0, this, TQ_SLOT(reportBug()), actionCollection(), "report_bug"); } void TDEFileReplacePart::initView() @@ -904,7 +904,7 @@ void TDEFileReplacePart::fileReplace() // Avoids files that not match requirements if(!TDEFileReplaceLib::isAnAccessibleFile(d.canonicalPath(), fileName, m_option)) continue; - kapp->processEvents(); + tdeApp->processEvents(); if(m_option->m_backup) replaceAndBackup(d.canonicalPath(), fileName); else @@ -960,7 +960,7 @@ void TDEFileReplacePart::recursiveFileReplace(const TQString &directoryName, int TQFileInfo qi(filePath); m_view->displayScannedFiles(foldersNumber, filesNumber); - kapp->processEvents(); + tdeApp->processEvents(); // Replace recursively if "filePath" is a directory and we have not reached the max depth level if (qi.isDir()) @@ -1245,7 +1245,7 @@ void TDEFileReplacePart::fileSearch(const TQString& directoryName, const TQStrin TQFileInfo fileInfo(filePath+"/"+fileName); if(fileInfo.isDir()) continue; - kapp->processEvents(); + tdeApp->processEvents(); search(filePath, fileName); filesNumber++; m_view->displayScannedFiles(0, filesNumber); @@ -1297,7 +1297,7 @@ void TDEFileReplacePart::recursiveFileSearch(const TQString &directoryName, cons m_view->displayScannedFiles(foldersNumber, filesNumber); - kapp->processEvents(); + tdeApp->processEvents(); // Searchs recursively if "filePath" is a directory and we have not reached the max depth level if (fileInfo.isDir()) { diff --git a/tdefilereplace/tdefilereplacepart.h b/tdefilereplace/tdefilereplacepart.h index 4495ae9..7e841cd 100644 --- a/tdefilereplace/tdefilereplacepart.h +++ b/tdefilereplace/tdefilereplacepart.h @@ -31,7 +31,7 @@ class TDEFileReplaceView; class TDEFileReplacePart: public KParts::ReadOnlyPart { - Q_OBJECT + TQ_OBJECT private: //MEMBERS diff --git a/tdefilereplace/tdefilereplaceview.cpp b/tdefilereplace/tdefilereplaceview.cpp index 87d6482..616b3e3 100644 --- a/tdefilereplace/tdefilereplaceview.cpp +++ b/tdefilereplace/tdefilereplaceview.cpp @@ -52,25 +52,25 @@ TDEFileReplaceView::TDEFileReplaceView(RCOptions* info, TQWidget *parent,const c initGUI(); // result listview: connect events - connect(m_lvResults, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(slotResultMouseButtonClicked(int, TQListViewItem *, const TQPoint &))); - connect(m_lvResults, TQT_SIGNAL(returnPressed(TQListViewItem *)), - this, TQT_SLOT(slotResultReturnPressed(TQListViewItem *))); - connect(m_lvResults, TQT_SIGNAL(executed(TQListViewItem *)), - this, TQT_SLOT(slotResultReturnPressed(TQListViewItem *))); - connect(m_lvResults_2, TQT_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT(slotResultMouseButtonClicked(int, TQListViewItem *, const TQPoint &))); - connect(m_lvResults_2, TQT_SIGNAL(returnPressed(TQListViewItem *)), - this, TQT_SLOT(slotResultReturnPressed(TQListViewItem *))); - connect(m_lvResults_2, TQT_SIGNAL(executed(TQListViewItem *)), - this, TQT_SLOT(slotResultReturnPressed(TQListViewItem *))); + connect(m_lvResults, TQ_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(slotResultMouseButtonClicked(int, TQListViewItem *, const TQPoint &))); + connect(m_lvResults, TQ_SIGNAL(returnPressed(TQListViewItem *)), + this, TQ_SLOT(slotResultReturnPressed(TQListViewItem *))); + connect(m_lvResults, TQ_SIGNAL(executed(TQListViewItem *)), + this, TQ_SLOT(slotResultReturnPressed(TQListViewItem *))); + connect(m_lvResults_2, TQ_SIGNAL(mouseButtonClicked(int, TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT(slotResultMouseButtonClicked(int, TQListViewItem *, const TQPoint &))); + connect(m_lvResults_2, TQ_SIGNAL(returnPressed(TQListViewItem *)), + this, TQ_SLOT(slotResultReturnPressed(TQListViewItem *))); + connect(m_lvResults_2, TQ_SIGNAL(executed(TQListViewItem *)), + this, TQ_SLOT(slotResultReturnPressed(TQListViewItem *))); // connect header events - connect(m_lvResults->header(), TQT_SIGNAL(clicked(int)), this,TQT_SLOT(slotResultHeaderClicked(int))); - connect(m_lvResults_2->header(), TQT_SIGNAL(clicked(int)), this,TQT_SLOT(slotResultHeaderClicked(int))); + connect(m_lvResults->header(), TQ_SIGNAL(clicked(int)), this,TQ_SLOT(slotResultHeaderClicked(int))); + connect(m_lvResults_2->header(), TQ_SIGNAL(clicked(int)), this,TQ_SLOT(slotResultHeaderClicked(int))); // string listview: connect events - connect(m_lvStrings, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(slotStringsAdd())); - connect(m_lvStrings_2, TQT_SIGNAL(doubleClicked(TQListViewItem *)), this, TQT_SLOT(slotStringsAdd())); + connect(m_lvStrings, TQ_SIGNAL(doubleClicked(TQListViewItem *)), this, TQ_SLOT(slotStringsAdd())); + connect(m_lvStrings_2, TQ_SIGNAL(doubleClicked(TQListViewItem *)), this, TQ_SLOT(slotStringsAdd())); whatsThis(); } @@ -220,7 +220,7 @@ void TDEFileReplaceView::slotResultMouseButtonClicked(int button, TQListViewItem if (lvi == 0) // No item selected return; - if (button == Qt::RightButton) + if (button == TQt::RightButton) { // Right mouse button: open popup menub m_menuResult->popup(pos); @@ -283,7 +283,7 @@ void TDEFileReplaceView::slotResultEdit() while (lvi) { - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); DCOPRef quanta(client->appId(),"WindowManagerIf"); TQString path = TQString(lvi->text(1)+"/"+lvi->text(0)); TQListViewItem *lviChild = lvi; @@ -747,7 +747,7 @@ void TDEFileReplaceView::initGUI() m_stackStrings->addWidget(m_lvStrings); m_stackStrings->addWidget(m_lvStrings_2); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); QCStringList appList = client->registeredApplications(); bool quantaFound = false; @@ -768,37 +768,37 @@ void TDEFileReplaceView::initGUI() m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("document-open")), i18n("&Open"), this, - TQT_SLOT(slotResultOpen())); + TQ_SLOT(slotResultOpen())); m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("document-open")), i18n("Open &With..."), this, - TQT_SLOT(slotResultOpenWith())); + TQ_SLOT(slotResultOpenWith())); if(quantaFound) { m_menuResult->insertItem(SmallIconSet("quanta"), i18n("&Edit in Quanta"), this, - TQT_SLOT(slotResultEdit())); + TQ_SLOT(slotResultEdit())); } m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("go-up")), i18n("Open Parent &Folder"), this, - TQT_SLOT(slotResultDirOpen())); + TQ_SLOT(slotResultDirOpen())); m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("edit-clear")), i18n("Remove &Entry"), this, - TQT_SLOT(slotResultRemoveEntry())); + TQ_SLOT(slotResultRemoveEntry())); m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("edit-delete")), i18n("&Delete"), this, - TQT_SLOT(slotResultDelete())); + TQ_SLOT(slotResultDelete())); m_menuResult->insertSeparator(); m_menuResult->insertItem(SmallIconSet(TQString::fromLatin1("application-vnd.tde.info")), i18n("&Properties"), this, - TQT_SLOT(slotResultProperties())); + TQ_SLOT(slotResultProperties())); changeViews(); } diff --git a/tdefilereplace/tdefilereplaceview.h b/tdefilereplace/tdefilereplaceview.h index 4e554e8..f4e5cab 100644 --- a/tdefilereplace/tdefilereplaceview.h +++ b/tdefilereplace/tdefilereplaceview.h @@ -56,7 +56,7 @@ class coord */ class TDEFileReplaceView : public TDEFileReplaceViewWdg { - Q_OBJECT + TQ_OBJECT public://Constructors TDEFileReplaceView(RCOptions* info, TQWidget *parent,const char *name); |