From e42639ac66e6d552395f0879cae1c1b2ae4df181 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:09:48 -0600 Subject: [PATCH] Rename old tq methods that no longer need a unique name (cherry picked from commit df8ca9f120239eea3c831702ab4d08c260018784) --- kerry/src/hitwidget_layout.ui | 22 +++++------ kerry/src/kcm/backends.cpp | 2 +- kerry/src/kcm/beagle.cpp | 2 +- kerry/src/kcm/kerry.cpp | 2 +- kerry/src/kcm/status.cpp | 38 +++++++++--------- kerry/src/kcm/status.h | 12 +++--- kerry/src/kerryapp.cpp | 2 +- kerry/src/searchdlg.cpp | 72 +++++++++++++++++------------------ kerry/src/searchdlg.h | 2 +- kerry/src/searchdlg_layout.ui | 48 +++++++++++------------ 10 files changed, 101 insertions(+), 101 deletions(-) diff --git a/kerry/src/hitwidget_layout.ui b/kerry/src/hitwidget_layout.ui index f8354b5..b169dca 100644 --- a/kerry/src/hitwidget_layout.ui +++ b/kerry/src/hitwidget_layout.ui @@ -48,7 +48,7 @@ Expanding - + 20 1 @@ -73,7 +73,7 @@ Fixed - + 20 2 @@ -92,13 +92,13 @@ 0 - + 64 64 - + 64 64 @@ -143,7 +143,7 @@ Expanding - + 20 0 @@ -162,7 +162,7 @@ Fixed - + 8 20 @@ -179,7 +179,7 @@ Fixed - + 8 20 @@ -218,7 +218,7 @@ Expanding - + 210 1 @@ -251,7 +251,7 @@ Fixed - + 16 20 @@ -328,7 +328,7 @@ Expanding - + 10 0 @@ -351,7 +351,7 @@ MinimumExpanding - + 10 0 diff --git a/kerry/src/kcm/backends.cpp b/kerry/src/kcm/backends.cpp index f649f18..2526f7d 100644 --- a/kerry/src/kcm/backends.cpp +++ b/kerry/src/kcm/backends.cpp @@ -102,7 +102,7 @@ void KCMBeagleBackends::save() void KCMBeagleBackends::gotAvailableBackends(KProcess*, char *buffer, int len) { - TQString myBuf = TQString::tqfromLatin1(buffer, len); + TQString myBuf = TQString::fromLatin1(buffer, len); if (myBuf.startsWith("User:")) { TQStringList list = TQStringList::split('\n',myBuf); for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) diff --git a/kerry/src/kcm/beagle.cpp b/kerry/src/kcm/beagle.cpp index cade927..d3211f6 100644 --- a/kerry/src/kcm/beagle.cpp +++ b/kerry/src/kcm/beagle.cpp @@ -46,7 +46,7 @@ KCMBeagle::KCMBeagle(TQWidget *parent, const char *name) m_backends = new KCMBeagleBackends( m_tab, name ); m_backends->tqlayout()->setMargin( KDialog::marginHint() ); - m_status = new KCMBeagletqStatus( m_tab, name ); + m_status = new KCMBeagleStatus( m_tab, name ); m_status->tqlayout()->setMargin( KDialog::marginHint() ); m_tab->addTab(m_indexing, i18n("&Indexing")); diff --git a/kerry/src/kcm/kerry.cpp b/kerry/src/kcm/kerry.cpp index 7ce3bb2..69cabdd 100644 --- a/kerry/src/kcm/kerry.cpp +++ b/kerry/src/kcm/kerry.cpp @@ -51,7 +51,7 @@ KCMKerry::KCMKerry(TQWidget *parent, const char *name) m_backends = new KCMBeagleBackends( m_tab, name ); m_backends->tqlayout()->setMargin( KDialog::marginHint() ); - m_status = new KCMBeagletqStatus( m_tab, name ); + m_status = new KCMBeagleStatus( m_tab, name ); m_status->tqlayout()->setMargin( KDialog::marginHint() ); m_tab->addTab(m_search, i18n("&Search")); diff --git a/kerry/src/kcm/status.cpp b/kerry/src/kcm/status.cpp index 81d56a4..6d296d9 100644 --- a/kerry/src/kcm/status.cpp +++ b/kerry/src/kcm/status.cpp @@ -36,7 +36,7 @@ extern "C" { #include } -KCMBeagletqStatus::KCMBeagletqStatus(TQWidget *parent, const char * ) +KCMBeagleStatus::KCMBeagleStatus(TQWidget *parent, const char * ) : KCModule(parent, "kcmbeaglestatus") { TQVBoxLayout* general_layout = new TQVBoxLayout( this, KDialog::spacingHint() ); @@ -71,29 +71,29 @@ KCMBeagletqStatus::KCMBeagletqStatus(TQWidget *parent, const char * ) dummy = new TQWidget( footer_box ); footer_box->setStretchFactor( dummy, 1 ); pb_refresh = new KPushButton (i18n("Refresh Status"), footer_box); - connect (pb_refresh, TQT_SIGNAL (clicked()), this, TQT_SLOT (refreshtqStatus ()) ); + connect (pb_refresh, TQT_SIGNAL (clicked()), this, TQT_SLOT (refreshStatus ()) ); g_type_init (); - refreshtqStatus (); + refreshStatus (); load(); } -KCMBeagletqStatus::~KCMBeagletqStatus() +KCMBeagleStatus::~KCMBeagleStatus() { } -void KCMBeagletqStatus::load() +void KCMBeagleStatus::load() { load( false ); } -void KCMBeagletqStatus::load( bool useDefaults ) +void KCMBeagleStatus::load( bool useDefaults ) { emit changed( useDefaults ); } -void KCMBeagletqStatus::defaults() +void KCMBeagleStatus::defaults() { // if (!beagle_util_daemon_is_running ()) // controlPressed(); @@ -101,12 +101,12 @@ void KCMBeagletqStatus::defaults() load( true ); } -void KCMBeagletqStatus::save() +void KCMBeagleStatus::save() { } -bool KCMBeagletqStatus::refreshDaemontqStatus () +bool KCMBeagleStatus::refreshDaemonStatus () { gboolean is_running = beagle_util_daemon_is_running (); if (is_running) { @@ -121,12 +121,12 @@ bool KCMBeagletqStatus::refreshDaemontqStatus () return is_running; } -void KCMBeagletqStatus::refreshtqStatus () +void KCMBeagleStatus::refreshStatus () { pb_refresh->setDisabled (TRUE); - bool is_running = refreshDaemontqStatus (); + bool is_running = refreshDaemonStatus (); - status_box->setTitle ( TQString ("[%1] ").arg (TQDateTime::tqcurrentDateTime ().toString ()) ); + status_box->setTitle ( TQString ("[%1] ").arg (TQDateTime::currentDateTime ().toString ()) ); if (! is_running) { version_label->setText (i18n("Service not started.")); pb_refresh->setDisabled (FALSE); @@ -157,25 +157,25 @@ void KCMBeagletqStatus::refreshtqStatus () pb_refresh->setDisabled (FALSE); } -void KCMBeagletqStatus::controlPressed () +void KCMBeagleStatus::controlPressed () { pb_control->setDisabled (TRUE); if (last_status) { if (stopBeagle ()) - TQTimer::singleShot (1000, this, TQT_SLOT (verifytqStatus ())); + TQTimer::singleShot (1000, this, TQT_SLOT (verifyStatus ())); } else { if (startBeagle ()) - TQTimer::singleShot (5000, this, TQT_SLOT (verifytqStatus ())); + TQTimer::singleShot (5000, this, TQT_SLOT (verifyStatus ())); } } -void KCMBeagletqStatus::verifytqStatus () +void KCMBeagleStatus::verifyStatus () { pb_control->setEnabled (TRUE); - refreshDaemontqStatus (); + refreshDaemonStatus (); } -bool KCMBeagletqStatus::stopBeagle () +bool KCMBeagleStatus::stopBeagle () { gboolean is_running = beagle_util_daemon_is_running (); if (! is_running) { @@ -194,7 +194,7 @@ bool KCMBeagletqStatus::stopBeagle () return true; } -bool KCMBeagletqStatus::startBeagle () +bool KCMBeagleStatus::startBeagle () { gboolean is_running = beagle_util_daemon_is_running (); if (is_running) { diff --git a/kerry/src/kcm/status.h b/kerry/src/kcm/status.h index 31ae35f..f4b3bc8 100644 --- a/kerry/src/kcm/status.h +++ b/kerry/src/kcm/status.h @@ -29,14 +29,14 @@ #include #include -class KCMBeagletqStatus : public KCModule +class KCMBeagleStatus : public KCModule { Q_OBJECT TQ_OBJECT public: - KCMBeagletqStatus(TQWidget *parent=0, const char *name=0); - ~KCMBeagletqStatus(); + KCMBeagleStatus(TQWidget *parent=0, const char *name=0); + ~KCMBeagleStatus(); virtual void load(); virtual void load( bool useDefaults ); @@ -44,12 +44,12 @@ public: virtual void defaults(); private slots: - void refreshtqStatus (); + void refreshStatus (); void controlPressed (); - void verifytqStatus (); + void verifyStatus (); private: - bool refreshDaemontqStatus (); + bool refreshDaemonStatus (); bool stopBeagle (); bool startBeagle (); diff --git a/kerry/src/kerryapp.cpp b/kerry/src/kerryapp.cpp index 3446783..dfd96c4 100644 --- a/kerry/src/kerryapp.cpp +++ b/kerry/src/kerryapp.cpp @@ -247,7 +247,7 @@ void KerryApplication::checkBeagleBuildIndex() bool current_wapidir = false; for ( TQStringList::Iterator it = entryList.begin(); it != entryList.end(); ++it ) { - if ( TQFileInfo("tmp/"+(*it)).lastModified().date()==TQDate::tqcurrentDate() ) { + if ( TQFileInfo("tmp/"+(*it)).lastModified().date()==TQDate::currentDate() ) { current_wapidir=true; break; } diff --git a/kerry/src/searchdlg.cpp b/kerry/src/searchdlg.cpp index 5941256..a7ef79e 100644 --- a/kerry/src/searchdlg.cpp +++ b/kerry/src/searchdlg.cpp @@ -127,13 +127,13 @@ static TQLabel* switchLabel[switchLabelCount] = {showEverything, showApplication displayed_results.clear(); displayAmount = 5; displayOffset = 0; - labeltqStatus->tqsetAlignment(TQt::SingleLine); + labelStatus->setAlignment(TQt::SingleLine); pPreviewJob = 0; pPreviewMimeTypes = 0; previewItems.clear(); previewItems.setAutoDelete(true); pending_showQuickTips=true; - updatetqStatus(); + updateStatus(); defaultSortOrder = Modified; currentSortOrder = defaultSortOrder; kapp->dcopClient()->setDefaultObject( objId() ); @@ -190,7 +190,7 @@ void SearchDlg::showQuickTips() tableHits->insertItem(item); - labeltqStatus->setText(""); + labelStatus->setText(""); } void SearchDlg::search(const TQString & search) @@ -253,7 +253,7 @@ void SearchDlg::setDisplayAmount(int amount) tableHits->setUpdatesEnabled(false); fillTableHits(); tableHits->setUpdatesEnabled(true); - updatetqStatus(); + updateStatus(); } void SearchDlg::setSortOrder(int order) @@ -296,7 +296,7 @@ void SearchDlg::slotClear() tableHits->clear(); displayed_results.clear(); results.clear(); - updatetqStatus(); + updateStatus(); } void SearchDlg::slotPrevious() @@ -308,7 +308,7 @@ void SearchDlg::slotPrevious() tableHits->setUpdatesEnabled(false); fillTableHits(); tableHits->setUpdatesEnabled(true); - updatetqStatus(); + updateStatus(); } void SearchDlg::slotNext() @@ -320,7 +320,7 @@ void SearchDlg::slotNext() tableHits->setUpdatesEnabled(false); fillTableHits(); tableHits->setUpdatesEnabled(true); - updatetqStatus(); + updateStatus(); } void SearchDlg::sortFilterResults() @@ -330,7 +330,7 @@ void SearchDlg::sortFilterResults() tableHits->clear(); displayed_results.clear(); displayResults(results); - updatetqStatus(); + updateStatus(); } void SearchDlg::fillTableHits() @@ -359,11 +359,11 @@ void SearchDlg::fillTableHits() } } -void SearchDlg::updatetqStatus() +void SearchDlg::updateStatus() { buttonPrevious->setEnabled(displayOffset>0); buttonNext->setEnabled(displayOffset+displayAmount<(int)displayed_results.count()); - labeltqStatus->tqsetAlignment(TQt::SingleLine); + labelStatus->setAlignment(TQt::SingleLine); const int count = displayed_results.count(); TQString text; if (displayAmount==1) @@ -380,7 +380,7 @@ void SearchDlg::updatetqStatus() text=text+" "+i18n("(still searching)")+""; #endif - labeltqStatus->setText(text); + labelStatus->setText(text); } void SearchDlg::search() @@ -415,12 +415,12 @@ void SearchDlg::search() connect(buttonStart, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(slotStartBeagle())); tableHits->insertItem(item); - labeltqStatus->setText(""); + labelStatus->setText(""); return; } slotClear(); - labeltqStatus->setText(i18n("Searching...")); + labelStatus->setText(i18n("Searching...")); // Beagle search if (beagle_search != NULL) { @@ -587,7 +587,7 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde title = takeProperty("Title",_properties); headerFileLabel->setText(title.isEmpty() ? i18n("Untitled Page") : title); - headerFileLabel->tqsetAlignment(headerFileLabel->tqalignment() | TQt::SingleLine); + headerFileLabel->setAlignment(headerFileLabel->tqalignment() | TQt::SingleLine); headerFileLabel->setURL(*(result->uri)); item->insertHeaderWidget(0,headerFileLabel); connect(headerFileLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(slotOpen())); @@ -604,7 +604,7 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde TQLabel *headerLabel = new TQLabel(item); headerLabel->setText(i18n("Weblog:")); - headerLabel->tqsetAlignment(headerLabel->tqalignment() | TQt::SingleLine); + headerLabel->setAlignment(headerLabel->tqalignment() | TQt::SingleLine); item->insertHeaderWidget(0,headerLabel); TQStringList _properties(result->properties); @@ -615,7 +615,7 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde KerryLabel *headerFileLabel = new KerryLabel(item); headerFileLabel->setText(title.isEmpty() ? i18n("Untitled Entry") : title); - headerFileLabel->tqsetAlignment(headerFileLabel->tqalignment() | TQt::SingleLine); + headerFileLabel->setAlignment(headerFileLabel->tqalignment() | TQt::SingleLine); headerFileLabel->setURL(identifier); item->insertHeaderWidget(1,headerFileLabel); connect(headerFileLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(slotOpen())); @@ -654,7 +654,7 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde KerryLabel *headerNoteLabel = new KerryLabel(item); headerNoteLabel->setText(title.isEmpty() ? i18n("Untitled Entry") : title); - headerNoteLabel->tqsetAlignment(headerNoteLabel->tqalignment() | TQt::SingleLine); + headerNoteLabel->setAlignment(headerNoteLabel->tqalignment() | TQt::SingleLine); headerNoteLabel->setURL(item->uri()); item->insertHeaderWidget(0,headerNoteLabel); connect(headerNoteLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(slotOpen())); @@ -801,7 +801,7 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde TQLabel *headerLabel = new TQLabel(item); headerLabel->setText(i18n("From")); - headerLabel->tqsetAlignment(headerLabel->tqalignment() | TQt::SingleLine); + headerLabel->setAlignment(headerLabel->tqalignment() | TQt::SingleLine); item->insertHeaderWidget(1,headerLabel); KerryLabel *headerFromLabel = new KerryLabel(item); @@ -825,7 +825,7 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde TQLabel *headerLabel = new TQLabel(item); headerLabel->setText(i18n("Application:")); - headerLabel->tqsetAlignment(headerLabel->tqalignment() | TQt::SingleLine); + headerLabel->setAlignment(headerLabel->tqalignment() | TQt::SingleLine); item->insertHeaderWidget(0,headerLabel); KerryLabel *headerFileLabel = new KerryLabel(item); @@ -881,12 +881,12 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde { TQLabel *headerLabel = new TQLabel(item); headerLabel->setText(i18n("From")); - headerLabel->tqsetAlignment(headerLabel->tqalignment() | TQt::SingleLine); + headerLabel->setAlignment(headerLabel->tqalignment() | TQt::SingleLine); item->insertHeaderWidget(1,headerLabel); KerryLabel *headerFileLabel = new KerryLabel(item); headerFileLabel->setText(homepage); - headerFileLabel->tqsetAlignment(headerFileLabel->tqalignment() | TQt::SingleLine); + headerFileLabel->setAlignment(headerFileLabel->tqalignment() | TQt::SingleLine); headerFileLabel->setURL(homepage); item->insertHeaderWidget(2,headerFileLabel); connect(headerFileLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(slotOpenURL(const TQString&))); @@ -965,7 +965,7 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde TQLabel *headerLabel = new TQLabel(item); headerLabel->setText(i18n("In Folder")); - headerLabel->tqsetAlignment(headerLabel->tqalignment() | TQt::SingleLine); + headerLabel->setAlignment(headerLabel->tqalignment() | TQt::SingleLine); item->insertHeaderWidget(1,headerLabel); KerryLabel *headerDirLabel = new KerryLabel(item); @@ -1028,7 +1028,7 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde TQLabel *headerLabel = new TQLabel(item); headerLabel->setText(i18n("In Folder")); - headerLabel->tqsetAlignment(headerLabel->tqalignment() | TQt::SingleLine); + headerLabel->setAlignment(headerLabel->tqalignment() | TQt::SingleLine); item->insertHeaderWidget(1,headerLabel); KerryLabel *headerDirLabel = new KerryLabel(item); @@ -1173,21 +1173,21 @@ void SearchDlg::displayResults(BeagleSearch::BeagleResultList &items) show = true; break; case Today: - show = ( datetime.date()==TQDate::tqcurrentDate() ); + show = ( datetime.date()==TQDate::currentDate() ); break; case SinceYesterday: - show = ( datetime.date()>TQDate::tqcurrentDate().addDays(-1) ); + show = ( datetime.date()>TQDate::currentDate().addDays(-1) ); break; case ThisWeek: - show = ( datetime.date().year()==TQDate::tqcurrentDate().year() && - datetime.date().weekNumber()==TQDate::tqcurrentDate().weekNumber() ); + show = ( datetime.date().year()==TQDate::currentDate().year() && + datetime.date().weekNumber()==TQDate::currentDate().weekNumber() ); break; case ThisMonth: - show = ( datetime.date().year()==TQDate::tqcurrentDate().year() && - datetime.date().month()==TQDate::tqcurrentDate().month() ); + show = ( datetime.date().year()==TQDate::currentDate().year() && + datetime.date().month()==TQDate::currentDate().month() ); break; case ThisYear: - show = ( datetime.date().year()==TQDate::tqcurrentDate().year() ); + show = ( datetime.date().year()==TQDate::currentDate().year() ); break; default: break; @@ -1238,7 +1238,7 @@ void SearchDlg::displayResults(BeagleSearch::BeagleResultList &items) fillTableHits(); tableHits->setUpdatesEnabled(true); } - updatetqStatus(); + updateStatus(); } void SearchDlg::slotOpen() @@ -1428,7 +1428,7 @@ void SearchDlg::searchLostOutput(BeagleSearch::VanishedURIList &items) tableHits->setUpdatesEnabled(true); } - updatetqStatus(); + updateStatus(); } void SearchDlg::searchFinished() @@ -1438,7 +1438,7 @@ void SearchDlg::searchFinished() still_searching = false; if (displayed_results.count()) { - updatetqStatus(); + updateStatus(); return; } @@ -1464,7 +1464,7 @@ void SearchDlg::searchFinished() beagleJustStarted = false; } item->setDescriptionText(text+""); - labeltqStatus->setText(""); + labelStatus->setText(""); tableHits->insertItem(item); } @@ -1570,7 +1570,7 @@ void SearchDlg::keyPressEvent(TQKeyEvent *e) tableHits->setUpdatesEnabled(false); fillTableHits(); tableHits->setUpdatesEnabled(true); - updatetqStatus(); + updateStatus(); } else slotNext(); @@ -1584,7 +1584,7 @@ void SearchDlg::keyPressEvent(TQKeyEvent *e) tableHits->setUpdatesEnabled(false); fillTableHits(); tableHits->setUpdatesEnabled(true); - updatetqStatus(); + updateStatus(); } else slotPrevious(); diff --git a/kerry/src/searchdlg.h b/kerry/src/searchdlg.h index 59ad0c7..3910e7a 100644 --- a/kerry/src/searchdlg.h +++ b/kerry/src/searchdlg.h @@ -132,7 +132,7 @@ class SearchDlg : public HitsLayout, virtual public dcopIface int defaultSortOrder,currentSortOrder; void insertResult(BeagleSearch::beagle_result_struct *result,int index); void fillTableHits(); - void updatetqStatus(); + void updateStatus(); void showQuickTips(); TQString formatBytes(TQString& bytesStr) const; TQCheckBox* cb_beagleStart; diff --git a/kerry/src/searchdlg_layout.ui b/kerry/src/searchdlg_layout.ui index c1204cb..a27eab6 100644 --- a/kerry/src/searchdlg_layout.ui +++ b/kerry/src/searchdlg_layout.ui @@ -12,7 +12,7 @@ 898 - + 0 0 @@ -37,7 +37,7 @@ 0 - + 480 440 @@ -67,7 +67,7 @@ 0 - + 24 24 @@ -114,7 +114,7 @@ false - + 0 0 @@ -142,13 +142,13 @@ 0 - + 32 32 - + 32 32 @@ -176,7 +176,7 @@ - labeltqStatus + labelStatus @@ -203,7 +203,7 @@ Fixed - + 16 20 @@ -225,7 +225,7 @@ 0 - + 0 0 @@ -256,7 +256,7 @@ 0 - + 0 0 @@ -329,7 +329,7 @@ 0 - + 40 0 @@ -459,7 +459,7 @@ Fixed - + 20 16 @@ -491,7 +491,7 @@ 0 - + 40 0 @@ -566,7 +566,7 @@ Fixed - + 20 16 @@ -598,7 +598,7 @@ 0 - + 40 0 @@ -695,7 +695,7 @@ Expanding - + 20 1 @@ -722,7 +722,7 @@ Preferred - + 0 20 @@ -741,7 +741,7 @@ 0 - + 0 0 @@ -766,7 +766,7 @@ 0 - + 0 0 @@ -897,7 +897,7 @@ setPalette(const QPalette&) setSelection(int,int) setCursorPosition(int) - tqsetAlignment(int) + setAlignment(int) cut() copy() paste() @@ -923,8 +923,8 @@ enabled tqgeometry sizePolicy - tqminimumSize - tqmaximumSize + minimumSize + maximumSize sizeIncrement baseSize paletteForegroundColor @@ -1038,8 +1038,8 @@ enabled tqgeometry sizePolicy - tqminimumSize - tqmaximumSize + minimumSize + maximumSize sizeIncrement baseSize paletteForegroundColor