diff options
Diffstat (limited to 'kfind')
| -rw-r--r-- | kfind/kdatecombo.cpp | 12 | ||||
| -rw-r--r-- | kfind/kfind.cpp | 10 | ||||
| -rw-r--r-- | kfind/kfinddlg.cpp | 28 | ||||
| -rw-r--r-- | kfind/kfindpart.cpp | 22 | ||||
| -rw-r--r-- | kfind/kfindpart.kdevprj | 178 | ||||
| -rw-r--r-- | kfind/kfindpart.kdevses | 20 | ||||
| -rw-r--r-- | kfind/kftabdlg.cpp | 70 | ||||
| -rw-r--r-- | kfind/kfwin.cpp | 36 | ||||
| -rw-r--r-- | kfind/kquery.cpp | 20 | ||||
| -rw-r--r-- | kfind/kquery.h | 2 |
10 files changed, 100 insertions, 298 deletions
diff --git a/kfind/kdatecombo.cpp b/kfind/kdatecombo.cpp index 05e6148a9..c22806d75 100644 --- a/kfind/kdatecombo.cpp +++ b/kfind/kdatecombo.cpp @@ -16,13 +16,13 @@ #include "kdatecombo.moc" -KDateCombo::KDateCombo(TQWidget *parent, const char *name ) : TQComboBox(FALSE, parent,name) +KDateCombo::KDateCombo(TQWidget *parent, const char *name ) : TQComboBox(false, parent,name) { TQDate date = TQDate::currentDate(); initObject(date, parent, name); } -KDateCombo::KDateCombo(const TQDate & date, TQWidget *parent, const char *name) : TQComboBox(FALSE, parent,name) +KDateCombo::KDateCombo(const TQDate & date, TQWidget *parent, const char *name) : TQComboBox(false, parent,name) { initObject(date, parent, name); } @@ -38,7 +38,7 @@ void KDateCombo::initObject(const TQDate & date, TQWidget *, const char *) popupFrame->setMainWidget(datePicker); setDate(date); - connect(datePicker, TQT_SIGNAL(dateSelected(TQDate)), this, TQT_SLOT(dateEnteredEvent(TQDate))); + connect(datePicker, TQ_SIGNAL(dateSelected(TQDate)), this, TQ_SLOT(dateEnteredEvent(TQDate))); } KDateCombo::~KDateCombo() @@ -69,9 +69,9 @@ bool KDateCombo::setDate(const TQDate & newDate) if (count()) clear(); insertItem(date2String(newDate)); - return TRUE; + return true; } - return FALSE; + return false; } void KDateCombo::dateEnteredEvent(TQDate newDate) @@ -105,7 +105,7 @@ bool KDateCombo::eventFilter (TQObject*, TQEvent* e) TQPoint p = mapFromGlobal( me->globalPos() ); if (rect().contains( p ) ) { - TQTimer::singleShot(10, this, TQT_SLOT(dateEnteredEvent())); + TQTimer::singleShot(10, this, TQ_SLOT(dateEnteredEvent())); return true; } } diff --git a/kfind/kfind.cpp b/kfind/kfind.cpp index 1675d9d71..bcf1e3cd8 100644 --- a/kfind/kfind.cpp +++ b/kfind/kfind.cpp @@ -71,17 +71,17 @@ Kfind::Kfind(TQWidget *parent, const char *name) mSearch = new KPushButton( KGuiItem(i18n("&Find"), "edit-find"), mButtonBox ); mButtonBox->setSpacing( (tabWidget->sizeHint().height()-4*mSearch->sizeHint().height()) / 4); - connect( mSearch, TQT_SIGNAL(clicked()), this, TQT_SLOT( startSearch() ) ); + connect( mSearch, TQ_SIGNAL(clicked()), this, TQ_SLOT( startSearch() ) ); mStop = new KPushButton( KGuiItem(i18n("Stop"), "process-stop"), mButtonBox ); - connect( mStop, TQT_SIGNAL(clicked()), this, TQT_SLOT( stopSearch() ) ); + connect( mStop, TQ_SIGNAL(clicked()), this, TQ_SLOT( stopSearch() ) ); mSave = new KPushButton( KStdGuiItem::saveAs(), mButtonBox ); - connect( mSave, TQT_SIGNAL(clicked()), this, TQT_SLOT( saveResults() ) ); + connect( mSave, TQ_SIGNAL(clicked()), this, TQ_SLOT( saveResults() ) ); KPushButton * mClose = new KPushButton( KStdGuiItem::close(), mButtonBox ); - connect( mClose, TQT_SIGNAL(clicked()), this, TQT_SIGNAL( destroyMe() ) ); + connect( mClose, TQ_SIGNAL(clicked()), this, TQ_SIGNAL( destroyMe() ) ); // react to search requests from widget - connect( tabWidget, TQT_SIGNAL(startSearch()), this, TQT_SLOT( startSearch() ) ); + connect( tabWidget, TQ_SIGNAL(startSearch()), this, TQ_SLOT( startSearch() ) ); mSearch->setEnabled(true); // Enable "Search" mStop->setEnabled(false); // Disable "Stop" diff --git a/kfind/kfinddlg.cpp b/kfind/kfinddlg.cpp index 7fabcecde..2e9dbf235 100644 --- a/kfind/kfinddlg.cpp +++ b/kfind/kfinddlg.cpp @@ -14,7 +14,7 @@ #include <tdemessagebox.h> #include <kdebug.h> #include <tdeaboutapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "kftabdlg.h" #include "kquery.h" @@ -62,20 +62,20 @@ KfindDlg::KfindDlg(const KURL & url, TQWidget *parent, const char *name) vBox->addWidget(win, 1); vBox->addWidget(mStatusBar, 0); - connect(this, TQT_SIGNAL(applyClicked()), - this, TQT_SLOT(startSearch())); - connect(this, TQT_SIGNAL(user1Clicked()), - this, TQT_SLOT(stopSearch())); - connect(this, TQT_SIGNAL(user2Clicked()), - win, TQT_SLOT(saveResults())); + connect(this, TQ_SIGNAL(applyClicked()), + this, TQ_SLOT(startSearch())); + connect(this, TQ_SIGNAL(user1Clicked()), + this, TQ_SLOT(stopSearch())); + connect(this, TQ_SIGNAL(user2Clicked()), + win, TQ_SLOT(saveResults())); - connect(win ,TQT_SIGNAL(resultSelected(bool)), - this,TQT_SIGNAL(resultSelected(bool))); + connect(win ,TQ_SIGNAL(resultSelected(bool)), + this,TQ_SIGNAL(resultSelected(bool))); query = new KQuery(frame); - connect(query, TQT_SIGNAL(addFile(const KFileItem*,const TQString&)), - TQT_SLOT(addFile(const KFileItem*,const TQString&))); - connect(query, TQT_SIGNAL(result(int)), TQT_SLOT(slotResult(int))); + connect(query, TQ_SIGNAL(addFile(const KFileItem*,const TQString&)), + TQ_SLOT(addFile(const KFileItem*,const TQString&))); + connect(query, TQ_SIGNAL(result(int)), TQ_SLOT(slotResult(int))); dirwatch=NULL; } @@ -121,8 +121,8 @@ void KfindDlg::startSearch() if(dirwatch!=NULL) delete dirwatch; dirwatch=new KDirWatch(); - connect(dirwatch, TQT_SIGNAL(created(const TQString&)), this, TQT_SLOT(slotNewItems(const TQString&))); - connect(dirwatch, TQT_SIGNAL(deleted(const TQString&)), this, TQT_SLOT(slotDeleteItem(const TQString&))); + connect(dirwatch, TQ_SIGNAL(created(const TQString&)), this, TQ_SLOT(slotNewItems(const TQString&))); + connect(dirwatch, TQ_SIGNAL(deleted(const TQString&)), this, TQ_SLOT(slotDeleteItem(const TQString&))); dirwatch->addDir(query->url().path(),true); #if 0 diff --git a/kfind/kfindpart.cpp b/kfind/kfindpart.cpp index 54de01e9b..760c6a42f 100644 --- a/kfind/kfindpart.cpp +++ b/kfind/kfindpart.cpp @@ -26,7 +26,7 @@ #include <tdelocale.h> #include <tqdir.h> -#include <kinstance.h> +#include <tdeinstance.h> class KonqDirPart; @@ -53,18 +53,18 @@ KFindPart::KFindPart( TQWidget * parentWidget, const char *widgetName, setWidget( m_kfindWidget ); - connect( m_kfindWidget, TQT_SIGNAL(started()), - this, TQT_SLOT(slotStarted()) ); - connect( m_kfindWidget, TQT_SIGNAL(destroyMe()), - this, TQT_SLOT(slotDestroyMe()) ); - connect(m_kfindWidget->dirlister,TQT_SIGNAL(deleteItem(KFileItem*)), this, TQT_SLOT(removeFile(KFileItem*))); - connect(m_kfindWidget->dirlister,TQT_SIGNAL(newItems(const KFileItemList&)), this, TQT_SLOT(newFiles(const KFileItemList&))); + connect( m_kfindWidget, TQ_SIGNAL(started()), + this, TQ_SLOT(slotStarted()) ); + connect( m_kfindWidget, TQ_SIGNAL(destroyMe()), + this, TQ_SLOT(slotDestroyMe()) ); + connect(m_kfindWidget->dirlister,TQ_SIGNAL(deleteItem(KFileItem*)), this, TQ_SLOT(removeFile(KFileItem*))); + connect(m_kfindWidget->dirlister,TQ_SIGNAL(newItems(const KFileItemList&)), this, TQ_SLOT(newFiles(const KFileItemList&))); //setXMLFile( "kfind.rc" ); query = new KQuery(this); - connect(query, TQT_SIGNAL(addFile(const KFileItem *, const TQString&)), - TQT_SLOT(addFile(const KFileItem *, const TQString&))); - connect(query, TQT_SIGNAL(result(int)), - TQT_SLOT(slotResult(int))); + connect(query, TQ_SIGNAL(addFile(const KFileItem *, const TQString&)), + TQ_SLOT(addFile(const KFileItem *, const TQString&))); + connect(query, TQ_SIGNAL(result(int)), + TQ_SLOT(slotResult(int))); m_kfindWidget->setQuery(query); m_bShowsResult = false; diff --git a/kfind/kfindpart.kdevprj b/kfind/kfindpart.kdevprj deleted file mode 100644 index d9fbfc7e2..000000000 --- a/kfind/kfindpart.kdevprj +++ /dev/null @@ -1,178 +0,0 @@ -[./AUTHORS] -dist=true -install=false -install_location= -type=DATA - -[./ChangeLog] -dist=true -install=false -install_location= -type=DATA - -[./Makefile.am] -files=./AUTHORS,./ChangeLog,./README,./TODO,./findpart.desktop,./kfind.cpp,./kfind.h,./kfindpart.cpp,./kfindpart.desktop,./kfindpart.h,./kftabdlg.cpp,./kftabdlg.h,./kquery.cpp,./kquery.h,./version.h,./kfindpart.kdevprj, -sub_dirs=pics, -type=normal - -[./README] -dist=true -install=false -install_location= -type=DATA - -[./TODO] -dist=true -install=false -install_location= -type=DATA - -[./findpart.desktop] -dist=true -install=false -install_location= -type=DATA - -[./kfind.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[./kfind.h] -dist=true -install=false -install_location= -type=HEADER - -[./kfindpart.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[./kfindpart.desktop] -dist=true -install=false -install_location= -type=DATA - -[./kfindpart.h] -dist=true -install=false -install_location= -type=HEADER - -[./kfindpart.kdevprj] -dist=true -install=false -install_location= -type=DATA - -[./kftabdlg.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[./kftabdlg.h] -dist=true -install=false -install_location= -type=HEADER - -[./kquery.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[./kquery.h] -dist=true -install=false -install_location= -type=HEADER - -[./version.h] -dist=true -install=false -install_location= -type=HEADER - -[Config for BinMakefileAm] -addcxxflags= -bin_program=kfindpart -cxxflags= -ldadd= -ldflags= - -[General] -AMChanged=false -author=eric -email=eric@darkstar.fr -kdevprj_version=1.3 -lfv_open_groups= -makefiles=./Makefile.am,pics/Makefile.am, -project_name=kfindpart -project_type=normal_empty -sub_dir= -version= -version_control=CVS -workspace=1 - -[LFV Groups] -Desktop=*.desktop, -GNU=AUTHORS,COPYING,ChangeLog,INSTALL,README,TODO,NEWS, -Headers=*.h,*.hxx,*.hpp,*.H, -Others=*, -Sources=*.cpp,*.c,*.cc,*.C,*.cxx,*.ec,*.ecpp,*.lxx,*.l++,*.ll,*.l, -Translations=*.ts,*.po, -User Interface=*.ui,*.kdevdlg,*.rc, -groups=Headers,Sources,GNU,Translations,User Interface,Desktop,Others - -[pics/Makefile.am] -files=pics/lo22-action-archive.png,pics/lo22-action-delete.png,pics/lo22-action-idea.png,pics/lo22-action-info.png,pics/lo22-action-openfile.png,pics/lo22-action-save.png,pics/lo22-action-search.png, -sub_dirs= -type=normal - -[pics/lo22-action-archive.png] -dist=true -install=false -install_location= -type=DATA - -[pics/lo22-action-delete.png] -dist=true -install=false -install_location= -type=DATA - -[pics/lo22-action-idea.png] -dist=true -install=false -install_location= -type=DATA - -[pics/lo22-action-info.png] -dist=true -install=false -install_location= -type=DATA - -[pics/lo22-action-openfile.png] -dist=true -install=false -install_location= -type=DATA - -[pics/lo22-action-save.png] -dist=true -install=false -install_location= -type=DATA - -[pics/lo22-action-search.png] -dist=true -install=false -install_location= -type=DATA diff --git a/kfind/kfindpart.kdevses b/kfind/kfindpart.kdevses deleted file mode 100644 index 3a5983ecf..000000000 --- a/kfind/kfindpart.kdevses +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version = '1.0' encoding = 'UTF-8'?> -<!DOCTYPE KDevPrjSession> -<KDevPrjSession> - <Mainframe MaximizeMode="0" /> - <DocsAndViews NumberOfDocuments="4" > - <Doc0 CursorPosLine="44" Type="KWriteDoc" NumberOfViews="1" CursorPosCol="0" FileName="/home/eric/kde/tdebase/kfind/kfind.cpp" > - <View0 Top="0" Width="754" Attach="1" Height="388" Left="0" Focus="0" Type="KWriteView" MinMaxMode="0" /> - </Doc0> - <Doc1 CursorPosLine="20" Type="KWriteDoc" NumberOfViews="1" CursorPosCol="0" FileName="/home/eric/kde/tdebase/kfind/kfind.h" > - <View0 Top="0" Width="754" Attach="1" Height="388" Left="0" Focus="0" Type="KWriteView" MinMaxMode="0" /> - </Doc1> - <Doc2 CursorPosLine="31" Type="KWriteDoc" NumberOfViews="1" CursorPosCol="0" FileName="/home/eric/kde/tdebase/kfind/kftabdlg.h" > - <View0 Top="0" Width="754" Attach="1" Height="388" Left="0" Focus="0" Type="KWriteView" MinMaxMode="0" /> - </Doc2> - <Doc3 CursorPosLine="51" Type="KWriteDoc" NumberOfViews="1" CursorPosCol="0" FileName="/home/eric/kde/tdebase/kfind/kftabdlg.cpp" > - <View0 Top="0" Width="754" Attach="1" Height="388" Left="0" Focus="1" Type="KWriteView" MinMaxMode="0" /> - </Doc3> - </DocsAndViews> - <LastCompileConfig>(Default)</LastCompileConfig> -</KDevPrjSession> diff --git a/kfind/kftabdlg.cpp b/kfind/kftabdlg.cpp index 6def97ec6..919972a0a 100644 --- a/kfind/kftabdlg.cpp +++ b/kfind/kftabdlg.cpp @@ -25,7 +25,7 @@ #include <tdefiledialog.h> #include <kregexpeditorinterface.h> #include <tdeparts/componentfactory.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "kquery.h" #include "kftabdlg.h" @@ -59,11 +59,11 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) pages[0] = new TQWidget( this, "page1" ); - nameBox = new KComboBox(TRUE, pages[0], "combo1"); + nameBox = new KComboBox(true, pages[0], "combo1"); nameBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry TQLabel * namedL = new TQLabel(nameBox, i18n("&Named:"), pages[0], "named"); TQToolTip::add( namedL, i18n("You can use wildcard matching and \";\" for separating multiple names") ); - dirBox = new KComboBox(TRUE, pages[0], "combo2"); + dirBox = new KComboBox(true, pages[0], "combo2"); dirBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry TQLabel * lookinL = new TQLabel(dirBox, i18n("Look &in:"), pages[0], "named"); subdirsCb = new TQCheckBox(i18n("Include &subfolders"), pages[0]); @@ -79,9 +79,9 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) if(TDEStandardDirs::findExe("locate")==NULL) useLocateCb->setEnabled(false); - nameBox->setDuplicatesEnabled(FALSE); + nameBox->setDuplicatesEnabled(false); nameBox->setFocus(); - dirBox->setDuplicatesEnabled(FALSE); + dirBox->setDuplicatesEnabled(false); nameBox->setInsertionPolicy(TQComboBox::AtTop); dirBox->setInsertionPolicy(TQComboBox::AtTop); @@ -134,11 +134,11 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) // Signals - connect( browseB, TQT_SIGNAL(clicked()), - this, TQT_SLOT(getDirectory()) ); + connect( browseB, TQ_SIGNAL(clicked()), + this, TQ_SLOT(getDirectory()) ); - connect( nameBox, TQT_SIGNAL(activated(int)), - this, TQT_SIGNAL(startSearch())); + connect( nameBox, TQ_SIGNAL(activated(int)), + this, TQ_SIGNAL(startSearch())); // ************ Page Two @@ -149,7 +149,7 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) rb[0] = new TQRadioButton(i18n("&between"), pages[1] ); rb[1] = new TQRadioButton(i18n("&during the previous"), pages[1] ); TQLabel * andL = new TQLabel(i18n("and"), pages[1], "and"); - betweenType = new KComboBox(FALSE, pages[1], "comboBetweenType"); + betweenType = new KComboBox(false, pages[1], "comboBetweenType"); betweenType->insertItem(i18n("minute(s)")); betweenType->insertItem(i18n("hour(s)")); betweenType->insertItem(i18n("day(s)")); @@ -164,11 +164,11 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) toDate = new KDateCombo(pages[1], "toDate"); timeBox = new TQSpinBox(1, 60, 1, pages[1], "timeBox"); - sizeBox =new KComboBox(FALSE, pages[1], "sizeBox"); + sizeBox =new KComboBox(false, pages[1], "sizeBox"); TQLabel * sizeL =new TQLabel(sizeBox,i18n("File &size is:"), pages[1],"size"); sizeEdit=new TQSpinBox(0, INT_MAX, 1, pages[1], "sizeEdit" ); sizeEdit->setValue(1); - sizeUnitBox =new KComboBox(FALSE, pages[1], "sizeUnitBox"); + sizeUnitBox =new KComboBox(false, pages[1], "sizeUnitBox"); m_usernameBox = new KComboBox( true, pages[1], "m_combo1"); TQLabel *usernameLabel= new TQLabel(m_usernameBox,i18n("Files owned by &user:"),pages[1]); @@ -189,8 +189,8 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) int tmp = sizeEdit->fontMetrics().width(" 000000000 "); sizeEdit->setMinimumSize(tmp, sizeEdit->sizeHint().height()); - m_usernameBox->setDuplicatesEnabled(FALSE); - m_groupBox->setDuplicatesEnabled(FALSE); + m_usernameBox->setDuplicatesEnabled(false); + m_groupBox->setDuplicatesEnabled(false); m_usernameBox->setInsertionPolicy(TQComboBox::AtTop); m_groupBox->setInsertionPolicy(TQComboBox::AtTop); @@ -235,22 +235,22 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) grid1->setRowStretch(6,1); // Connect - connect( findCreated, TQT_SIGNAL(toggled(bool)), TQT_SLOT(fixLayout()) ); - connect( bg, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(fixLayout()) ); - connect( sizeBox, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotSizeBoxChanged(int))); + connect( findCreated, TQ_SIGNAL(toggled(bool)), TQ_SLOT(fixLayout()) ); + connect( bg, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(fixLayout()) ); + connect( sizeBox, TQ_SIGNAL(highlighted(int)), this, TQ_SLOT(slotSizeBoxChanged(int))); // ************ Page Three pages[2] = new TQWidget( this, "page3" ); - typeBox =new KComboBox(FALSE, pages[2], "typeBox"); + typeBox =new KComboBox(false, pages[2], "typeBox"); typeBox->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed); // allow smaller than widest entry TQLabel * typeL =new TQLabel(typeBox, i18n("File &type:"), pages[2], "type"); textEdit=new KLineEdit(pages[2], "textEdit" ); TQLabel * textL =new TQLabel(textEdit, i18n("C&ontaining text:"), pages[2], "text"); - connect( textEdit, TQT_SIGNAL(returnPressed(const TQString &)), TQT_SIGNAL( startSearch())); + connect( textEdit, TQ_SIGNAL(returnPressed(const TQString &)), TQ_SIGNAL( startSearch())); const TQString containingtext = i18n("<qt>If specified, only files that contain this text" @@ -306,9 +306,9 @@ KfindTabWidget::KfindTabWidget(TQWidget *parent, const char *name) if ( editRegExp ) { // The editor was available, so lets use it. - connect( regexpContentCb, TQT_SIGNAL(toggled(bool) ), editRegExp, TQT_SLOT(setEnabled(bool)) ); + connect( regexpContentCb, TQ_SIGNAL(toggled(bool) ), editRegExp, TQ_SLOT(setEnabled(bool)) ); editRegExp->setEnabled(false); - connect( editRegExp, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotEditRegExp() ) ); + connect( editRegExp, TQ_SIGNAL(clicked()), this, TQ_SLOT( slotEditRegExp() ) ); } else regexpContentCb->hide(); @@ -543,18 +543,18 @@ void KfindTabWidget::setDefaults() bool KfindTabWidget::isDateValid() { // All files - if ( !findCreated->isChecked() ) return TRUE; + if ( !findCreated->isChecked() ) return true; if (rb[1]->isChecked()) { - if (timeBox->value() > 0 ) return TRUE; + if (timeBox->value() > 0 ) return true; KMessageBox::sorry(this, i18n("Unable to search within a period that is less than a minute.")); - return FALSE; + return false; } // If we can not parse either of the dates or - // "from" date is bigger than "to" date return FALSE. + // "from" date is bigger than "to" date return false. TQDate hi1, hi2; TQString str; @@ -568,9 +568,9 @@ bool KfindTabWidget::isDateValid() if (!str.isNull()) { KMessageBox::sorry(0, str); - return FALSE; + return false; } - return TRUE; + return true; } void KfindTabWidget::setQuery(KQuery *query) @@ -756,12 +756,12 @@ void KfindTabWidget::beginSearch() /// dirlister->openURL(KURL(dirBox->currentText().stripWhiteSpace())); saveHistory(); - setEnabled( FALSE ); + setEnabled( false ); } void KfindTabWidget::endSearch() { - setEnabled( TRUE ); + setEnabled( true ); } /* @@ -775,16 +775,16 @@ void KfindTabWidget::fixLayout() // and second radio group on page two if(! findCreated->isChecked()) { - fromDate->setEnabled(FALSE); - toDate->setEnabled(FALSE); - timeBox->setEnabled(FALSE); + fromDate->setEnabled(false); + toDate->setEnabled(false); + timeBox->setEnabled(false); for(i=0; i<2; i++) - rb[i]->setEnabled(FALSE); - betweenType->setEnabled(FALSE); + rb[i]->setEnabled(false); + betweenType->setEnabled(false); } else { for(i=0; i<2; i++) - rb[i]->setEnabled(TRUE); + rb[i]->setEnabled(true); fromDate->setEnabled(rb[0]->isChecked()); toDate->setEnabled(rb[0]->isChecked()); diff --git a/kfind/kfwin.cpp b/kfind/kfwin.cpp index f068d031e..5399d3c92 100644 --- a/kfind/kfwin.cpp +++ b/kfind/kfwin.cpp @@ -25,9 +25,9 @@ #include <tdelocale.h> #include <tdeapplication.h> #include <krun.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kpropertiesdialog.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <kmimetype.h> #include <tdeglobal.h> @@ -110,7 +110,7 @@ KfindWindow::KfindWindow( TQWidget *parent, const char *name ) ,m_menu(0) { setSelectionMode( TQListView::Extended ); - setShowSortIndicator( TRUE ); + setShowSortIndicator( true ); addColumn(i18n("Name")); addColumn(i18n("In Subfolder")); @@ -131,14 +131,14 @@ KfindWindow::KfindWindow( TQWidget *parent, const char *name ) resetColumns(true); - connect( this, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT( selectionHasChanged() )); + connect( this, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT( selectionHasChanged() )); - connect(this, TQT_SIGNAL(contextMenu(TDEListView *, TQListViewItem*,const TQPoint&)), - this, TQT_SLOT(slotContextMenu(TDEListView *,TQListViewItem*,const TQPoint&))); + connect(this, TQ_SIGNAL(contextMenu(TDEListView *, TQListViewItem*,const TQPoint&)), + this, TQ_SLOT(slotContextMenu(TDEListView *,TQListViewItem*,const TQPoint&))); - connect(this, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotExecute(TQListViewItem*))); + connect(this, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotExecute(TQListViewItem*))); setDragEnabled(true); } @@ -178,7 +178,7 @@ void KfindWindow::copySelection() if (drag_obj) { - TQClipboard *cb = kapp->clipboard(); + TQClipboard *cb = tdeApp->clipboard(); cb->setData(drag_obj); } } @@ -409,21 +409,21 @@ void KfindWindow::slotContextMenu(TDEListView *,TQListViewItem *item,const TQPoi { //menu = new TDEPopupMenu(item->text(0), this); m_menu->insertTitle(item->text(0)); - m_menu->insertItem(SmallIcon("document-open"),i18n("Menu item", "Open"), this, TQT_SLOT(openBinding())); - m_menu->insertItem(SmallIcon("window-new"),i18n("Open Folder"), this, TQT_SLOT(openFolder())); + m_menu->insertItem(SmallIcon("document-open"),i18n("Menu item", "Open"), this, TQ_SLOT(openBinding())); + m_menu->insertItem(SmallIcon("window-new"),i18n("Open Folder"), this, TQ_SLOT(openFolder())); m_menu->insertSeparator(); - m_menu->insertItem(SmallIcon("edit-copy"),i18n("Copy"), this, TQT_SLOT(copySelection())); - m_menu->insertItem(SmallIcon("edit-delete"),i18n("Delete"), this, TQT_SLOT(deleteFiles())); + m_menu->insertItem(SmallIcon("edit-copy"),i18n("Copy"), this, TQ_SLOT(copySelection())); + m_menu->insertItem(SmallIcon("edit-delete"),i18n("Delete"), this, TQ_SLOT(deleteFiles())); m_menu->insertSeparator(); - m_menu->insertItem(i18n("Open With..."), this, TQT_SLOT(slotOpenWith())); + m_menu->insertItem(i18n("Open With..."), this, TQ_SLOT(slotOpenWith())); m_menu->insertSeparator(); - m_menu->insertItem(i18n("Properties"), this, TQT_SLOT(fileProperties())); + m_menu->insertItem(i18n("Properties"), this, TQ_SLOT(fileProperties())); } else { m_menu->insertTitle(i18n("Selected Files")); - m_menu->insertItem(SmallIcon("edit-copy"),i18n("Copy"), this, TQT_SLOT(copySelection())); - m_menu->insertItem(SmallIcon("edit-delete"),i18n("Delete"), this, TQT_SLOT(deleteFiles())); + m_menu->insertItem(SmallIcon("edit-copy"),i18n("Copy"), this, TQ_SLOT(copySelection())); + m_menu->insertItem(SmallIcon("edit-delete"),i18n("Delete"), this, TQ_SLOT(deleteFiles())); } m_menu->popup(p, 1); } diff --git a/kfind/kquery.cpp b/kfind/kquery.cpp index 1e3617c70..abeee3c5f 100644 --- a/kfind/kquery.cpp +++ b/kfind/kquery.cpp @@ -7,7 +7,7 @@ #include <tdeapplication.h> #include <tdemessagebox.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kzip.h> #include "kquery.h" @@ -21,9 +21,9 @@ KQuery::KQuery(TQObject *parent, const char * name) m_regexps.setAutoDelete(true); m_fileItems.setAutoDelete(true); processLocate = new TDEProcess(this); - connect(processLocate,TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),this,TQT_SLOT(slotreceivedSdtout(TDEProcess*,char*,int))); - connect(processLocate,TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),this,TQT_SLOT(slotreceivedSdterr(TDEProcess*,char*,int))); - connect(processLocate,TQT_SIGNAL(processExited(TDEProcess*)),this,TQT_SLOT(slotendProcessLocate(TDEProcess*))); + connect(processLocate,TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)),this,TQ_SLOT(slotreceivedSdtout(TDEProcess*,char*,int))); + connect(processLocate,TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)),this,TQ_SLOT(slotreceivedSdterr(TDEProcess*,char*,int))); + connect(processLocate,TQ_SIGNAL(processExited(TDEProcess*)),this,TQ_SLOT(slotendProcessLocate(TDEProcess*))); // Files with these mime types can be ignored, even if // findFormatByFileContent() in some cases may claim that @@ -87,10 +87,10 @@ void KQuery::start() else job = TDEIO::listDir( m_url, false ); - connect(job, TQT_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), - TQT_SLOT(slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &))); - connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *))); - connect(job, TQT_SIGNAL(canceled(TDEIO::Job *)), TQT_SLOT(slotCanceled(TDEIO::Job *))); + connect(job, TQ_SIGNAL(entries(TDEIO::Job *, const TDEIO::UDSEntryList &)), + TQ_SLOT(slotListEntries(TDEIO::Job *, const TDEIO::UDSEntryList &))); + connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *))); + connect(job, TQ_SIGNAL(canceled(TDEIO::Job *)), TQ_SLOT(slotCanceled(TDEIO::Job *))); } void KQuery::slotResult( TDEIO::Job * _job ) @@ -384,7 +384,7 @@ void KQuery::processQuery( KFileItem* file) return; } } - kapp->processEvents(); + tdeApp->processEvents(); } delete stream; @@ -452,7 +452,7 @@ void KQuery::setRegExp(const TQString ®exp, bool caseSensitive) TQRegExp *regExp; TQRegExp sep(";"); TQStringList strList=TQStringList::split( sep, regexp, false); -// TQRegExp globChars ("[\\*\\?\\[\\]]", TRUE, FALSE); +// TQRegExp globChars ("[\\*\\?\\[\\]]", true, false); m_regexps.clear(); // m_regexpsContainsGlobs.clear(); diff --git a/kfind/kquery.h b/kfind/kquery.h index 34ed16457..51e07b51d 100644 --- a/kfind/kquery.h +++ b/kfind/kquery.h @@ -11,7 +11,7 @@ #include <tdeio/job.h> #include <kurl.h> -#include <kprocess.h> +#include <tdeprocess.h> class KFileItem; |