diff --git a/kerry/src/beaglesearch.cpp b/kerry/src/beaglesearch.cpp index e73529c..f385655 100644 --- a/kerry/src/beaglesearch.cpp +++ b/kerry/src/beaglesearch.cpp @@ -354,7 +354,7 @@ void BeagleSearch::hits_added_cb (BeagleQuery *query, BeagleHitsAddedResponse *r const char *property = (char*)properties->data; if (property) { if (propertiesInfo[i].label) { - TQString propertystr = i18n(propertiesInfo[i].label).arg(property); + TQString propertystr = i18n(propertiesInfo[i].label).tqarg(property); result->properties.append(propertystr); } else diff --git a/kerry/src/hitwidget.cpp b/kerry/src/hitwidget.cpp index e44ba46..05afb9d 100644 --- a/kerry/src/hitwidget.cpp +++ b/kerry/src/hitwidget.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/kerry/src/hitwidget_layout.ui b/kerry/src/hitwidget_layout.ui index 517874f..f8354b5 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 @@ -107,7 +107,7 @@ image0 - + AlignCenter @@ -129,7 +129,7 @@ RichText - + WordBreak|AlignCenter @@ -143,7 +143,7 @@ Expanding - + 20 0 @@ -162,7 +162,7 @@ Fixed - + 8 20 @@ -179,7 +179,7 @@ Fixed - + 8 20 @@ -188,7 +188,7 @@ - layout8 + tqlayout8 @@ -218,7 +218,7 @@ Expanding - + 210 1 @@ -229,7 +229,7 @@ - layout27 + tqlayout27 @@ -251,7 +251,7 @@ Fixed - + 16 20 @@ -287,7 +287,7 @@ Description - + WordBreak|AlignTop @@ -306,7 +306,7 @@ Properties - + WordBreak|AlignTop @@ -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 46973f0..f649f18 100644 --- a/kerry/src/kcm/backends.cpp +++ b/kerry/src/kcm/backends.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include @@ -102,7 +102,7 @@ void KCMBeagleBackends::save() void KCMBeagleBackends::gotAvailableBackends(KProcess*, char *buffer, int len) { - TQString myBuf = TQString::fromLatin1(buffer, len); + TQString myBuf = TQString::tqfromLatin1(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 3a6676d..cade927 100644 --- a/kerry/src/kcm/beagle.cpp +++ b/kerry/src/kcm/beagle.cpp @@ -19,7 +19,7 @@ ******************************************************************/ -#include +#include #include #include #include @@ -36,18 +36,18 @@ KCMBeagle::KCMBeagle(TQWidget *parent, const char *name) { setButtons(Default+Apply); - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); m_tab = new TQTabWidget(this); - layout->addWidget(m_tab); + tqlayout->addWidget(m_tab); m_indexing = new KCMBeagleIndexing( m_tab, name ); - m_indexing->layout()->setMargin( KDialog::marginHint() ); + m_indexing->tqlayout()->setMargin( KDialog::marginHint() ); m_backends = new KCMBeagleBackends( m_tab, name ); - m_backends->layout()->setMargin( KDialog::marginHint() ); + m_backends->tqlayout()->setMargin( KDialog::marginHint() ); - m_status = new KCMBeagleStatus( m_tab, name ); - m_status->layout()->setMargin( KDialog::marginHint() ); + m_status = new KCMBeagletqStatus( m_tab, name ); + m_status->tqlayout()->setMargin( KDialog::marginHint() ); m_tab->addTab(m_indexing, i18n("&Indexing")); m_tab->addTab(m_backends, i18n("&Backends")); diff --git a/kerry/src/kcm/indexing.cpp b/kerry/src/kcm/indexing.cpp index 3197fbe..defb795 100644 --- a/kerry/src/kcm/indexing.cpp +++ b/kerry/src/kcm/indexing.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -47,7 +47,7 @@ KCMBeagleIndexing::KCMBeagleIndexing(TQWidget *parent, const char * ) TQGroupBox* gb_general = new TQGroupBox(0, Qt::Vertical, i18n("General"), this); top_layout->addWidget(gb_general); gb_general->setFlat(true); - TQVBoxLayout* gb_general_layout = new TQVBoxLayout( gb_general->layout(), KDialog::spacingHint() ); + TQVBoxLayout* gb_general_layout = new TQVBoxLayout( gb_general->tqlayout(), KDialog::spacingHint() ); startBeagle = new TQCheckBox(i18n("Start Beagle indexing service automatically"), gb_general); gb_general_layout->addWidget( startBeagle); @@ -59,7 +59,7 @@ KCMBeagleIndexing::KCMBeagleIndexing(TQWidget *parent, const char * ) TQGroupBox* gb_index = new TQGroupBox(0, Qt::Vertical, i18n("Index"), this); top_layout->addWidget(gb_index); gb_index->setFlat(true); - TQVBoxLayout* gb_index_layout = new TQVBoxLayout( gb_index->layout(), KDialog::spacingHint() ); + TQVBoxLayout* gb_index_layout = new TQVBoxLayout( gb_index->tqlayout(), KDialog::spacingHint() ); TQHBoxLayout* qh_index = new TQHBoxLayout(gb_index_layout); indexHome = new TQCheckBox(i18n("Index my home folder"), gb_index); @@ -96,7 +96,7 @@ KCMBeagleIndexing::KCMBeagleIndexing(TQWidget *parent, const char * ) TQGroupBox* gb_privacy = new TQGroupBox(0, Qt::Vertical, i18n("Privacy"), this); top_layout->addWidget(gb_privacy); gb_privacy->setFlat(true); - TQVBoxLayout* gb_privacy_layout = new TQVBoxLayout( gb_privacy->layout(), KDialog::spacingHint() ); + TQVBoxLayout* gb_privacy_layout = new TQVBoxLayout( gb_privacy->tqlayout(), KDialog::spacingHint() ); TQLabel* label_privacy = new TQLabel(i18n( "Specify any resource, such as folder or pattern, you wish to exclude from indexing." ), gb_privacy); gb_privacy_layout->addWidget(label_privacy); diff --git a/kerry/src/kcm/kerry.cpp b/kerry/src/kcm/kerry.cpp index 186a4e6..7ce3bb2 100644 --- a/kerry/src/kcm/kerry.cpp +++ b/kerry/src/kcm/kerry.cpp @@ -19,7 +19,7 @@ ******************************************************************/ -#include +#include #include #include #include @@ -39,20 +39,20 @@ KCMKerry::KCMKerry(TQWidget *parent, const char *name) { setButtons(Default+Apply); - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); m_tab = new TQTabWidget(this); - layout->addWidget(m_tab); + tqlayout->addWidget(m_tab); m_search = new KCMKerrySearch( m_tab, name ); - m_search->layout()->setMargin( KDialog::marginHint() ); + m_search->tqlayout()->setMargin( KDialog::marginHint() ); m_indexing = new KCMBeagleIndexing( m_tab, name ); - m_indexing->layout()->setMargin( KDialog::marginHint() ); + m_indexing->tqlayout()->setMargin( KDialog::marginHint() ); m_backends = new KCMBeagleBackends( m_tab, name ); - m_backends->layout()->setMargin( KDialog::marginHint() ); + m_backends->tqlayout()->setMargin( KDialog::marginHint() ); - m_status = new KCMBeagleStatus( m_tab, name ); - m_status->layout()->setMargin( KDialog::marginHint() ); + m_status = new KCMBeagletqStatus( m_tab, name ); + m_status->tqlayout()->setMargin( KDialog::marginHint() ); m_tab->addTab(m_search, i18n("&Search")); m_tab->addTab(m_indexing, i18n("&Indexing")); diff --git a/kerry/src/kcm/search.cpp b/kerry/src/kcm/search.cpp index 1f8e63d..e33563e 100644 --- a/kerry/src/kcm/search.cpp +++ b/kerry/src/kcm/search.cpp @@ -32,7 +32,7 @@ KCMKerrySearch::KCMKerrySearch(TQWidget *parent, const char * ) TQGroupBox* gb_general = new TQGroupBox(0, Qt::Vertical, i18n("General"), this); gb_general->setFlat(true); top_layout->addWidget(gb_general); - TQVBoxLayout* gb_general_layout = new TQVBoxLayout( gb_general->layout(), KDialog::spacingHint() ); + TQVBoxLayout* gb_general_layout = new TQVBoxLayout( gb_general->tqlayout(), KDialog::spacingHint() ); TQHBoxLayout* qh_layout = new TQHBoxLayout(gb_general_layout); TQLabel* label_order = new TQLabel(i18n("Default result sort order:"), gb_general); @@ -60,7 +60,7 @@ KCMKerrySearch::KCMKerrySearch(TQWidget *parent, const char * ) // Global Shortcuts TQGroupBox* gb_keys = new TQGroupBox(0, Qt::Vertical, i18n("Global Shortcuts"), this); - TQVBoxLayout* gb_keys_layout = new TQVBoxLayout( gb_keys->layout(), KDialog::spacingHint() ); + TQVBoxLayout* gb_keys_layout = new TQVBoxLayout( gb_keys->tqlayout(), KDialog::spacingHint() ); top_layout->addWidget(gb_keys); gb_keys->setFlat(true); diff --git a/kerry/src/kcm/search.h b/kerry/src/kcm/search.h index 3e5e279..dd9e52e 100644 --- a/kerry/src/kcm/search.h +++ b/kerry/src/kcm/search.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kerry/src/kcm/status.cpp b/kerry/src/kcm/status.cpp index dc2bdae..81d56a4 100644 --- a/kerry/src/kcm/status.cpp +++ b/kerry/src/kcm/status.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include @@ -36,7 +36,7 @@ extern "C" { #include } -KCMBeagleStatus::KCMBeagleStatus(TQWidget *parent, const char * ) +KCMBeagletqStatus::KCMBeagletqStatus(TQWidget *parent, const char * ) : KCModule(parent, "kcmbeaglestatus") { TQVBoxLayout* general_layout = new TQVBoxLayout( this, KDialog::spacingHint() ); @@ -71,29 +71,29 @@ KCMBeagleStatus::KCMBeagleStatus(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 (refreshStatus ()) ); + connect (pb_refresh, TQT_SIGNAL (clicked()), this, TQT_SLOT (refreshtqStatus ()) ); g_type_init (); - refreshStatus (); + refreshtqStatus (); load(); } -KCMBeagleStatus::~KCMBeagleStatus() +KCMBeagletqStatus::~KCMBeagletqStatus() { } -void KCMBeagleStatus::load() +void KCMBeagletqStatus::load() { load( false ); } -void KCMBeagleStatus::load( bool useDefaults ) +void KCMBeagletqStatus::load( bool useDefaults ) { emit changed( useDefaults ); } -void KCMBeagleStatus::defaults() +void KCMBeagletqStatus::defaults() { // if (!beagle_util_daemon_is_running ()) // controlPressed(); @@ -101,12 +101,12 @@ void KCMBeagleStatus::defaults() load( true ); } -void KCMBeagleStatus::save() +void KCMBeagletqStatus::save() { } -bool KCMBeagleStatus::refreshDaemonStatus () +bool KCMBeagletqStatus::refreshDaemontqStatus () { gboolean is_running = beagle_util_daemon_is_running (); if (is_running) { @@ -121,12 +121,12 @@ bool KCMBeagleStatus::refreshDaemonStatus () return is_running; } -void KCMBeagleStatus::refreshStatus () +void KCMBeagletqStatus::refreshtqStatus () { pb_refresh->setDisabled (TRUE); - bool is_running = refreshDaemonStatus (); + bool is_running = refreshDaemontqStatus (); - status_box->setTitle ( TQString ("[%1] ").arg (TQDateTime::currentDateTime ().toString ()) ); + status_box->setTitle ( TQString ("[%1] ").arg (TQDateTime::tqcurrentDateTime ().toString ()) ); if (! is_running) { version_label->setText (i18n("Service not started.")); pb_refresh->setDisabled (FALSE); @@ -157,25 +157,25 @@ void KCMBeagleStatus::refreshStatus () pb_refresh->setDisabled (FALSE); } -void KCMBeagleStatus::controlPressed () +void KCMBeagletqStatus::controlPressed () { pb_control->setDisabled (TRUE); if (last_status) { if (stopBeagle ()) - TQTimer::singleShot (1000, this, TQT_SLOT (verifyStatus ())); + TQTimer::singleShot (1000, this, TQT_SLOT (verifytqStatus ())); } else { if (startBeagle ()) - TQTimer::singleShot (5000, this, TQT_SLOT (verifyStatus ())); + TQTimer::singleShot (5000, this, TQT_SLOT (verifytqStatus ())); } } -void KCMBeagleStatus::verifyStatus () +void KCMBeagletqStatus::verifytqStatus () { pb_control->setEnabled (TRUE); - refreshDaemonStatus (); + refreshDaemontqStatus (); } -bool KCMBeagleStatus::stopBeagle () +bool KCMBeagletqStatus::stopBeagle () { gboolean is_running = beagle_util_daemon_is_running (); if (! is_running) { @@ -194,7 +194,7 @@ bool KCMBeagleStatus::stopBeagle () return true; } -bool KCMBeagleStatus::startBeagle () +bool KCMBeagletqStatus::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 3e44e05..31ae35f 100644 --- a/kerry/src/kcm/status.h +++ b/kerry/src/kcm/status.h @@ -25,18 +25,18 @@ #include #include -#include +#include #include #include -class KCMBeagleStatus : public KCModule +class KCMBeagletqStatus : public KCModule { Q_OBJECT TQ_OBJECT public: - KCMBeagleStatus(TQWidget *parent=0, const char *name=0); - ~KCMBeagleStatus(); + KCMBeagletqStatus(TQWidget *parent=0, const char *name=0); + ~KCMBeagletqStatus(); virtual void load(); virtual void load( bool useDefaults ); @@ -44,12 +44,12 @@ public: virtual void defaults(); private slots: - void refreshStatus (); + void refreshtqStatus (); void controlPressed (); - void verifyStatus (); + void verifytqStatus (); private: - bool refreshDaemonStatus (); + bool refreshDaemontqStatus (); bool stopBeagle (); bool startBeagle (); diff --git a/kerry/src/kerryapp.cpp b/kerry/src/kerryapp.cpp index 5fa520f..3446783 100644 --- a/kerry/src/kerryapp.cpp +++ b/kerry/src/kerryapp.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include @@ -129,7 +129,7 @@ void KerryApplication::init(const KAboutData* /*about*/) configChanged(); sysTrayIcon->setPixmap(sysTrayIcon->loadIcon("kerry_systemtray")); - TQToolTip::add(sysTrayIcon, i18n("Kerry Beagle Search (%1)").arg(globalKeys->shortcut("Show Kerry Dialog").seq(0).toString())); + TQToolTip::add(sysTrayIcon, i18n("Kerry Beagle Search (%1)").tqarg(globalKeys->shortcut("Show Kerry Dialog").seq(0).toString())); sysTrayIcon->show(); @@ -177,8 +177,8 @@ void KerryApplication::historySelected(int id) void KerryApplication::searchPrimarySelection() { - TQApplication::clipboard()->setSelectionMode( true ); - TQString text = TQApplication::clipboard()->text(); + TQApplication::tqclipboard()->setSelectionMode( true ); + TQString text = TQApplication::tqclipboard()->text(); if (!text.isEmpty() && hitListWindow) hitListWindow->search(text); } @@ -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::currentDate() ) { + if ( TQFileInfo("tmp/"+(*it)).lastModified().date()==TQDate::tqcurrentDate() ) { current_wapidir=true; break; } diff --git a/kerry/src/searchdlg.cpp b/kerry/src/searchdlg.cpp index 1cd8c44..8feff75 100644 --- a/kerry/src/searchdlg.cpp +++ b/kerry/src/searchdlg.cpp @@ -23,8 +23,8 @@ #include "kwidgetlistbox.h" #include "kerrylabel.h" -#include -#include +#include +#include #include #include #include @@ -127,13 +127,13 @@ static TQLabel* switchLabel[switchLabelCount] = {showEverything, showApplication displayed_results.clear(); displayAmount = 5; displayOffset = 0; - labelStatus->setAlignment(TQt::SingleLine); + labeltqStatus->tqsetAlignment(TQt::SingleLine); pPreviewJob = 0; pPreviewMimeTypes = 0; previewItems.clear(); previewItems.setAutoDelete(true); pending_showQuickTips=true; - updateStatus(); + updatetqStatus(); defaultSortOrder = Modified; currentSortOrder = defaultSortOrder; kapp->dcopClient()->setDefaultObject( objId() ); @@ -190,7 +190,7 @@ void SearchDlg::showQuickTips() tableHits->insertItem(item); - labelStatus->setText(""); + labeltqStatus->setText(""); } void SearchDlg::search(const TQString & search) @@ -253,7 +253,7 @@ void SearchDlg::setDisplayAmount(int amount) tableHits->setUpdatesEnabled(false); fillTableHits(); tableHits->setUpdatesEnabled(true); - updateStatus(); + updatetqStatus(); } void SearchDlg::setSortOrder(int order) @@ -296,7 +296,7 @@ void SearchDlg::slotClear() tableHits->clear(); displayed_results.clear(); results.clear(); - updateStatus(); + updatetqStatus(); } void SearchDlg::slotPrevious() @@ -308,7 +308,7 @@ void SearchDlg::slotPrevious() tableHits->setUpdatesEnabled(false); fillTableHits(); tableHits->setUpdatesEnabled(true); - updateStatus(); + updatetqStatus(); } void SearchDlg::slotNext() @@ -320,7 +320,7 @@ void SearchDlg::slotNext() tableHits->setUpdatesEnabled(false); fillTableHits(); tableHits->setUpdatesEnabled(true); - updateStatus(); + updatetqStatus(); } void SearchDlg::sortFilterResults() @@ -330,7 +330,7 @@ void SearchDlg::sortFilterResults() tableHits->clear(); displayed_results.clear(); displayResults(results); - updateStatus(); + updatetqStatus(); } void SearchDlg::fillTableHits() @@ -359,28 +359,28 @@ void SearchDlg::fillTableHits() } } -void SearchDlg::updateStatus() +void SearchDlg::updatetqStatus() { buttonPrevious->setEnabled(displayOffset>0); buttonNext->setEnabled(displayOffset+displayAmount<(int)displayed_results.count()); - labelStatus->setAlignment(TQt::SingleLine); + labeltqStatus->tqsetAlignment(TQt::SingleLine); const int count = displayed_results.count(); TQString text; if (displayAmount==1) - text=i18n("%1 results found.").arg(displayed_results.count()); + text=i18n("%1 results found.").tqarg(displayed_results.count()); else if (count==0) text=i18n("No results.").replace("",TQString()).replace("",TQString()); else if (displayOffset==0) - text=i18n("Best %1 results of %2 shown.").arg(tableHits->count()).arg(displayed_results.count()); + text=i18n("Best %1 results of %2 shown.").tqarg(tableHits->count()).tqarg(displayed_results.count()); else - text=i18n("Results %1 through %2 of %3 are shown.").arg(displayOffset+1).arg(displayOffset+tableHits->count()).arg(displayed_results.count()); + text=i18n("Results %1 through %2 of %3 are shown.").tqarg(displayOffset+1).tqarg(displayOffset+tableHits->count()).tqarg(displayed_results.count()); #if 0 if (still_searching) text=text+" "+i18n("(still searching)")+""; #endif - labelStatus->setText(text); + labeltqStatus->setText(text); } void SearchDlg::search() @@ -395,7 +395,7 @@ void SearchDlg::search() tableHits->clear(); HitWidget* item = new HitWidget(TQString(), TQString()); TQLabel *headerLabel = new TQLabel(item); - headerLabel->setText(i18n("The query for \"%1\" failed.").arg(current_query.get())); + headerLabel->setText(i18n("The query for \"%1\" failed.").tqarg(current_query.get())); item->insertHeaderWidget(0,headerLabel); item->setIcon("messagebox_critical"); @@ -415,12 +415,12 @@ void SearchDlg::search() connect(buttonStart, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(slotStartBeagle())); tableHits->insertItem(item); - labelStatus->setText(""); + labeltqStatus->setText(""); return; } slotClear(); - labelStatus->setText(i18n("Searching...")); + labeltqStatus->setText(i18n("Searching...")); // Beagle search if (beagle_search != NULL) { @@ -572,7 +572,7 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde TQDateTime datetime; datetime.setTime_t(result->last_index_time); if (datetime.date().year()>1970) - description = description + i18n("Last viewed: %1").arg(KGlobal::locale()->formatDateTime(datetime,false))+"
"; + description = description + i18n("Last viewed: %1").tqarg(KGlobal::locale()->formatDateTime(datetime,false))+"
"; } item->setDescriptionText(description +i18n("URL:")+" "+*(result->uri)+""); @@ -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->setAlignment(headerFileLabel->alignment() | TQt::SingleLine); + headerFileLabel->tqsetAlignment(headerFileLabel->tqalignment() | TQt::SingleLine); headerFileLabel->setURL(*(result->uri)); item->insertHeaderWidget(0,headerFileLabel); connect(headerFileLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(slotOpen())); @@ -597,14 +597,14 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde TQDateTime datetime; datetime.setTime_t(result->last_index_time); - item->setDescriptionText(""+ i18n("Published: %1").arg(KGlobal::locale()->formatDateTime(datetime,false))+"
"); + item->setDescriptionText(""+ i18n("Published: %1").tqarg(KGlobal::locale()->formatDateTime(datetime,false))+"
"); if (result->snippet) item->setPropertiesText(""+*(result->snippet)+""); TQLabel *headerLabel = new TQLabel(item); headerLabel->setText(i18n("Weblog:")); - headerLabel->setAlignment(headerLabel->alignment() | TQt::SingleLine); + headerLabel->tqsetAlignment(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->setAlignment(headerFileLabel->alignment() | TQt::SingleLine); + headerFileLabel->tqsetAlignment(headerFileLabel->tqalignment() | TQt::SingleLine); headerFileLabel->setURL(identifier); item->insertHeaderWidget(1,headerFileLabel); connect(headerFileLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(slotOpen())); @@ -625,7 +625,7 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde TQDateTime datetime; datetime.setTime_t(result->last_index_time); - item->setDescriptionText(""+ i18n("Last modified: %1").arg(KGlobal::locale()->formatDateTime(datetime,false))+"
"); + item->setDescriptionText(""+ i18n("Last modified: %1").tqarg(KGlobal::locale()->formatDateTime(datetime,false))+"
"); if (result->snippet) item->setPropertiesText(""+*(result->snippet)+""); @@ -643,7 +643,7 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde item->setIcon("contents2"); TQDateTime datetime; datetime.setTime_t(result->last_index_time); - item->setDescriptionText(""+ i18n("Last modified: %1").arg(KGlobal::locale()->formatDateTime(datetime,false))+"
"); + item->setDescriptionText(""+ i18n("Last modified: %1").tqarg(KGlobal::locale()->formatDateTime(datetime,false))+"
"); if (result->snippet) @@ -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->setAlignment(headerNoteLabel->alignment() | TQt::SingleLine); + headerNoteLabel->tqsetAlignment(headerNoteLabel->tqalignment() | TQt::SingleLine); headerNoteLabel->setURL(item->uri()); item->insertHeaderWidget(0,headerNoteLabel); connect(headerNoteLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(slotOpen())); @@ -668,9 +668,9 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde TQString properties; TQDateTime datetime; datetime = datetimeFromString(takeProperty("fixme:starttime",_properties)); - properties = properties + i18n("Start time: %1").arg(KGlobal::locale()->formatDateTime(datetime,false)) + "
"; + properties = properties + i18n("Start time: %1").tqarg(KGlobal::locale()->formatDateTime(datetime,false)) + "
"; datetime = datetimeFromString(takeProperty("fixme:endtime",_properties)); - properties = properties + i18n("End time: %1").arg(KGlobal::locale()->formatDateTime(datetime,false)) + "
"; + properties = properties + i18n("End time: %1").tqarg(KGlobal::locale()->formatDateTime(datetime,false)) + "
"; BeagleSearch::PropertyList::iterator it; for ( it = _properties.begin(); it != _properties.end(); ++it ) @@ -735,15 +735,15 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde number = addresseee.phoneNumber(KABC::PhoneNumber::Work).number(); if (!number.isEmpty()) - properties=properties+i18n("Business phone: %1").arg(number)+"
"; + properties=properties+i18n("Business phone: %1").tqarg(number)+"
"; number = addresseee.phoneNumber(KABC::PhoneNumber::Cell).number(); if (!number.isEmpty()) - properties=properties+i18n("Mobile phone: %1").arg(number)+"
"; + properties=properties+i18n("Mobile phone: %1").tqarg(number)+"
"; number = addresseee.phoneNumber(KABC::PhoneNumber::Home).number(); if (!number.isEmpty()) - properties=properties+i18n("Home phone: %1").arg(number)+"
"; + properties=properties+i18n("Home phone: %1").tqarg(number)+"
"; if (!properties.isEmpty()) item->setDescriptionText(""+properties+""); @@ -777,7 +777,7 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde TQDateTime received_datetime; received_datetime = datetimeFromString(received); if (!received.isEmpty()) - item->setDescriptionText(""+i18n("Received: %1").arg(KGlobal::locale()->formatDateTime(received_datetime,false))+""); + item->setDescriptionText(""+i18n("Received: %1").tqarg(KGlobal::locale()->formatDateTime(received_datetime,false))+""); TQString properties; BeagleSearch::PropertyList::iterator it; @@ -801,7 +801,7 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde TQLabel *headerLabel = new TQLabel(item); headerLabel->setText(i18n("From")); - headerLabel->setAlignment(headerLabel->alignment() | TQt::SingleLine); + headerLabel->tqsetAlignment(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->setAlignment(headerLabel->alignment() | TQt::SingleLine); + headerLabel->tqsetAlignment(headerLabel->tqalignment() | TQt::SingleLine); item->insertHeaderWidget(0,headerLabel); KerryLabel *headerFileLabel = new KerryLabel(item); @@ -844,7 +844,7 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde TQDateTime datetime; datetime.setTime_t(result->last_index_time); - item->setDescriptionText(""+i18n("Date: %1").arg(KGlobal::locale()->formatDateTime(datetime,false)+"")); + item->setDescriptionText(""+i18n("Date: %1").tqarg(KGlobal::locale()->formatDateTime(datetime,false)+"")); if (result->snippet) item->setPropertiesText(""+*(result->snippet)+ ""); @@ -853,7 +853,7 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde headerFileLabel->setURL(*(result->uri)); TQStringList _properties(result->properties); TQString person = takeProperty("fixme:speakingto",_properties); - headerFileLabel->setText(i18n("Conversation With %1").arg(person.isEmpty() ? i18n("Unknown Person") : person)); + headerFileLabel->setText(i18n("Conversation With %1").tqarg(person.isEmpty() ? i18n("Unknown Person") : person)); item->insertHeaderWidget(0,headerFileLabel); connect(headerFileLabel, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(slotOpen())); } @@ -881,12 +881,12 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde { TQLabel *headerLabel = new TQLabel(item); headerLabel->setText(i18n("From")); - headerLabel->setAlignment(headerLabel->alignment() | TQt::SingleLine); + headerLabel->tqsetAlignment(headerLabel->tqalignment() | TQt::SingleLine); item->insertHeaderWidget(1,headerLabel); KerryLabel *headerFileLabel = new KerryLabel(item); headerFileLabel->setText(homepage); - headerFileLabel->setAlignment(headerFileLabel->alignment() | TQt::SingleLine); + headerFileLabel->tqsetAlignment(headerFileLabel->tqalignment() | TQt::SingleLine); headerFileLabel->setURL(homepage); item->insertHeaderWidget(2,headerFileLabel); connect(headerFileLabel, TQT_SIGNAL(leftClickedURL(const TQString&)), TQT_SLOT(slotOpenURL(const TQString&))); @@ -898,19 +898,19 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde TQString install_time_str = takeProperty("fixme:install_time", _properties); if (!install_time_str.isEmpty()) { - properties=properties+i18n("Installed on: %1").arg(KGlobal::locale()->formatDateTime(datetimeFromString(install_time_str),false))+"
"; + properties=properties+i18n("Installed on: %1").tqarg(KGlobal::locale()->formatDateTime(datetimeFromString(install_time_str),false))+"
"; } TQString install_size_str = takeProperty("fixme:contents_byte_count", _properties); if (!install_size_str.isEmpty()) { - properties=properties+i18n("Installed size: %1").arg(formatBytes(install_size_str))+"
"; + properties=properties+i18n("Installed size: %1").tqarg(formatBytes(install_size_str))+"
"; } TQString download_size_str = takeProperty("fixme:size", _properties); if (!download_size_str.isEmpty()) { - properties=properties+i18n("Download size: %1").arg(formatBytes(download_size_str))+"
"; + properties=properties+i18n("Download size: %1").tqarg(formatBytes(download_size_str))+"
"; } BeagleSearch::PropertyList::iterator it; @@ -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->setAlignment(headerLabel->alignment() | TQt::SingleLine); + headerLabel->tqsetAlignment(headerLabel->tqalignment() | TQt::SingleLine); item->insertHeaderWidget(1,headerLabel); KerryLabel *headerDirLabel = new KerryLabel(item); @@ -982,7 +982,7 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde TQDateTime datetime; datetime.setTime_t(result->last_index_time); - title = i18n("Last modified: %1").arg(KGlobal::locale()->formatDateTime(datetime,false)); + title = i18n("Last modified: %1").tqarg(KGlobal::locale()->formatDateTime(datetime,false)); item->setDescriptionText(""+title+""); TQString properties; @@ -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->setAlignment(headerLabel->alignment() | TQt::SingleLine); + headerLabel->tqsetAlignment(headerLabel->tqalignment() | TQt::SingleLine); item->insertHeaderWidget(1,headerLabel); KerryLabel *headerDirLabel = new KerryLabel(item); @@ -1055,7 +1055,7 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde else { TQDateTime datetime; datetime.setTime_t(result->last_index_time); - title = i18n("Last modified: %1").arg(KGlobal::locale()->formatDateTime(datetime,false)); + title = i18n("Last modified: %1").tqarg(KGlobal::locale()->formatDateTime(datetime,false)); } item->setDescriptionText(""+title+""); @@ -1086,7 +1086,7 @@ void SearchDlg::insertResult(BeagleSearch::beagle_result_struct *result,int inde connect(buttonGo, TQT_SIGNAL(leftClickedURL()), TQT_SLOT(slotOpenDir())); } - item->score->setText(i18n("

Score: %1

").arg(result->score,0,'f',1)); + item->score->setText(i18n("

Score: %1

").tqarg(result->score,0,'f',1)); tableHits->insertItem(item,index); } @@ -1173,21 +1173,21 @@ void SearchDlg::displayResults(BeagleSearch::BeagleResultList &items) show = true; break; case Today: - show = ( datetime.date()==TQDate::currentDate() ); + show = ( datetime.date()==TQDate::tqcurrentDate() ); break; case SinceYesterday: - show = ( datetime.date()>TQDate::currentDate().addDays(-1) ); + show = ( datetime.date()>TQDate::tqcurrentDate().addDays(-1) ); break; case ThisWeek: - show = ( datetime.date().year()==TQDate::currentDate().year() && - datetime.date().weekNumber()==TQDate::currentDate().weekNumber() ); + show = ( datetime.date().year()==TQDate::tqcurrentDate().year() && + datetime.date().weekNumber()==TQDate::tqcurrentDate().weekNumber() ); break; case ThisMonth: - show = ( datetime.date().year()==TQDate::currentDate().year() && - datetime.date().month()==TQDate::currentDate().month() ); + show = ( datetime.date().year()==TQDate::tqcurrentDate().year() && + datetime.date().month()==TQDate::tqcurrentDate().month() ); break; case ThisYear: - show = ( datetime.date().year()==TQDate::currentDate().year() ); + show = ( datetime.date().year()==TQDate::tqcurrentDate().year() ); break; default: break; @@ -1238,7 +1238,7 @@ void SearchDlg::displayResults(BeagleSearch::BeagleResultList &items) fillTableHits(); tableHits->setUpdatesEnabled(true); } - updateStatus(); + updatetqStatus(); } void SearchDlg::slotOpen() @@ -1428,7 +1428,7 @@ void SearchDlg::searchLostOutput(BeagleSearch::VanishedURIList &items) tableHits->setUpdatesEnabled(true); } - updateStatus(); + updatetqStatus(); } void SearchDlg::searchFinished() @@ -1438,7 +1438,7 @@ void SearchDlg::searchFinished() still_searching = false; if (displayed_results.count()) { - updateStatus(); + updatetqStatus(); return; } @@ -1450,7 +1450,7 @@ void SearchDlg::searchFinished() tableHits->clear(); HitWidget* item = new HitWidget(TQString(), TQString()); TQLabel *headerLabel = new TQLabel(item); - headerLabel->setText(i18n("No results for \"%1\" were found.").arg(current_query.get())); + headerLabel->setText(i18n("No results for \"%1\" were found.").tqarg(current_query.get())); item->insertHeaderWidget(0,headerLabel); item->setIcon("messagebox_warning"); @@ -1464,7 +1464,7 @@ void SearchDlg::searchFinished() beagleJustStarted = false; } item->setDescriptionText(text+"
"); - labelStatus->setText(""); + labeltqStatus->setText(""); tableHits->insertItem(item); } @@ -1570,7 +1570,7 @@ void SearchDlg::keyPressEvent(TQKeyEvent *e) tableHits->setUpdatesEnabled(false); fillTableHits(); tableHits->setUpdatesEnabled(true); - updateStatus(); + updatetqStatus(); } else slotNext(); @@ -1584,7 +1584,7 @@ void SearchDlg::keyPressEvent(TQKeyEvent *e) tableHits->setUpdatesEnabled(false); fillTableHits(); tableHits->setUpdatesEnabled(true); - updateStatus(); + updatetqStatus(); } else slotPrevious(); diff --git a/kerry/src/searchdlg.h b/kerry/src/searchdlg.h index 3910e7a..59ad0c7 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 updateStatus(); + void updatetqStatus(); 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 c034114..c1204cb 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 @@ -49,7 +49,7 @@ - layout8 + tqlayout8 @@ -67,7 +67,7 @@ 0 - + 24 24 @@ -114,7 +114,7 @@ false - + 0 0 @@ -142,13 +142,13 @@ 0 - + 32 32 - + 32 32 @@ -168,7 +168,7 @@ - layout5 + tqlayout5 @@ -176,7 +176,7 @@ - labelStatus + labeltqStatus @@ -189,7 +189,7 @@ Results <b>%1 through %2 of %3</b> are shown. - + AlignVCenter @@ -203,7 +203,7 @@ Fixed - + 16 20 @@ -225,7 +225,7 @@ 0 - + 0 0 @@ -256,7 +256,7 @@ 0 - + 0 0 @@ -276,7 +276,7 @@ - layout4 + tqlayout4 @@ -329,7 +329,7 @@ 0 - + 40 0 @@ -357,7 +357,7 @@ Everything - + AlignVCenter @@ -368,7 +368,7 @@ Applications - + AlignVCenter @@ -379,7 +379,7 @@ Contacts - + AlignVCenter @@ -390,7 +390,7 @@ Office Documents - + AlignVCenter @@ -401,7 +401,7 @@ Conversations - + AlignVCenter @@ -412,7 +412,7 @@ Images - + AlignVCenter @@ -423,7 +423,7 @@ Media - + AlignVCenter @@ -434,7 +434,7 @@ Web Pages - + AlignVCenter @@ -445,7 +445,7 @@ File/Path Name - + AlignVCenter @@ -459,7 +459,7 @@ Fixed - + 20 16 @@ -491,7 +491,7 @@ 0 - + 40 0 @@ -519,7 +519,7 @@ Type - + AlignVCenter @@ -530,7 +530,7 @@ Date - + AlignVCenter @@ -541,7 +541,7 @@ Name - + WordBreak|AlignVCenter @@ -552,7 +552,7 @@ Relevance - + AlignVCenter @@ -566,7 +566,7 @@ Fixed - + 20 16 @@ -598,7 +598,7 @@ 0 - + 40 0 @@ -626,7 +626,7 @@ Any Date - + AlignVCenter @@ -637,7 +637,7 @@ Today - + AlignVCenter @@ -648,7 +648,7 @@ Since Yesterday - + AlignVCenter @@ -659,7 +659,7 @@ This Week - + AlignVCenter @@ -670,7 +670,7 @@ This Month - + AlignVCenter @@ -681,7 +681,7 @@ This Year - + AlignVCenter @@ -695,7 +695,7 @@ Expanding - + 20 1 @@ -706,7 +706,7 @@ - layout3 + tqlayout3 @@ -722,7 +722,7 @@ Preferred - + 0 20 @@ -741,7 +741,7 @@ 0 - + 0 0 @@ -766,7 +766,7 @@ 0 - + 0 0 @@ -849,14 +849,14 @@ update() update(int,int,int,int) update(const QRect&) - repaint() - repaint(bool) - repaint(int,int,int,int) - repaint(int,int,int,int,bool) - repaint(const QRect&) - repaint(const QRect&,bool) - repaint(const QRegion&) - repaint(const QRegion&,bool) + tqrepaint() + tqrepaint(bool) + tqrepaint(int,int,int,int) + tqrepaint(int,int,int,int,bool) + tqrepaint(const QRect&) + tqrepaint(const QRect&,bool) + tqrepaint(const QRegion&) + tqrepaint(const QRegion&,bool) show() hide() setShown(bool) @@ -897,7 +897,7 @@ setPalette(const QPalette&) setSelection(int,int) setCursorPosition(int) - setAlignment(int) + tqsetAlignment(int) cut() copy() paste() @@ -921,10 +921,10 @@ setTextWorkaround(const QString&) name enabled - geometry + tqgeometry sizePolicy - minimumSize - maximumSize + tqminimumSize + tqmaximumSize sizeIncrement baseSize paletteForegroundColor @@ -950,7 +950,7 @@ frame echoMode cursorPosition - alignment + tqalignment dragEnabled readOnly inputMask @@ -995,14 +995,14 @@ update() update(int,int,int,int) update(const QRect&) - repaint() - repaint(bool) - repaint(int,int,int,int) - repaint(int,int,int,int,bool) - repaint(const QRect&) - repaint(const QRect&,bool) - repaint(const QRegion&) - repaint(const QRegion&,bool) + tqrepaint() + tqrepaint(bool) + tqrepaint(int,int,int,int) + tqrepaint(int,int,int,int,bool) + tqrepaint(const QRect&) + tqrepaint(const QRect&,bool) + tqrepaint(const QRegion&) + tqrepaint(const QRegion&,bool) show() hide() setShown(bool) @@ -1036,10 +1036,10 @@ slotSettingsChanged(int) name enabled - geometry + tqgeometry sizePolicy - minimumSize - maximumSize + tqminimumSize + tqmaximumSize sizeIncrement baseSize paletteForegroundColor