diff --git a/kerry/src/beaglesearch.cpp b/kerry/src/beaglesearch.cpp
index f385655..e73529c 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).tqarg(property);
+ TQString propertystr = i18n(propertiesInfo[i].label).arg(property);
result->properties.append(propertystr);
}
else
diff --git a/kerry/src/hitwidget_layout.ui b/kerry/src/hitwidget_layout.ui
index b169dca..2b27782 100644
--- a/kerry/src/hitwidget_layout.ui
+++ b/kerry/src/hitwidget_layout.ui
@@ -107,7 +107,7 @@
image0
-
+
AlignCenter
@@ -129,7 +129,7 @@
RichText
-
+
WordBreak|AlignCenter
@@ -287,7 +287,7 @@
Description
-
+
WordBreak|AlignTop
@@ -306,7 +306,7 @@
Properties
-
+
WordBreak|AlignTop
diff --git a/kerry/src/kerryapp.cpp b/kerry/src/kerryapp.cpp
index dfd96c4..8b027c3 100644
--- a/kerry/src/kerryapp.cpp
+++ b/kerry/src/kerryapp.cpp
@@ -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)").tqarg(globalKeys->shortcut("Show Kerry Dialog").seq(0).toString()));
+ TQToolTip::add(sysTrayIcon, i18n("Kerry Beagle Search (%1)").arg(globalKeys->shortcut("Show Kerry Dialog").seq(0).toString()));
sysTrayIcon->show();
diff --git a/kerry/src/searchdlg.cpp b/kerry/src/searchdlg.cpp
index b817541..759134f 100644
--- a/kerry/src/searchdlg.cpp
+++ b/kerry/src/searchdlg.cpp
@@ -367,13 +367,13 @@ void SearchDlg::updateStatus()
const int count = displayed_results.count();
TQString text;
if (displayAmount==1)
- text=i18n("%1 results found.").tqarg(displayed_results.count());
+ text=i18n("%1 results found.").arg(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.").tqarg(tableHits->count()).tqarg(displayed_results.count());
+ text=i18n("Best %1 results of %2 shown.").arg(tableHits->count()).arg(displayed_results.count());
else
- text=i18n("Results %1 through %2 of %3 are shown.").tqarg(displayOffset+1).tqarg(displayOffset+tableHits->count()).tqarg(displayed_results.count());
+ text=i18n("Results %1 through %2 of %3 are shown.").arg(displayOffset+1).arg(displayOffset+tableHits->count()).arg(displayed_results.count());
#if 0
if (still_searching)
@@ -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.").tqarg(current_query.get()));
+ headerLabel->setText(i18n("The query for \"%1\" failed.").arg(current_query.get()));
item->insertHeaderWidget(0,headerLabel);
item->setIcon("messagebox_critical");
@@ -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").tqarg(KGlobal::locale()->formatDateTime(datetime,false))+"
";
+ description = description + i18n("Last viewed: %1").arg(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->tqalignment() | TQt::SingleLine);
+ headerFileLabel->setAlignment(headerFileLabel->alignment() | 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").tqarg(KGlobal::locale()->formatDateTime(datetime,false))+"
");
+ item->setDescriptionText(""+ i18n("Published: %1").arg(KGlobal::locale()->formatDateTime(datetime,false))+"
");
if (result->snippet)
item->setPropertiesText(""+*(result->snippet)+"");
TQLabel *headerLabel = new TQLabel(item);
headerLabel->setText(i18n("Weblog:"));
- headerLabel->setAlignment(headerLabel->tqalignment() | TQt::SingleLine);
+ headerLabel->setAlignment(headerLabel->alignment() | 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->tqalignment() | TQt::SingleLine);
+ headerFileLabel->setAlignment(headerFileLabel->alignment() | 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").tqarg(KGlobal::locale()->formatDateTime(datetime,false))+"
");
+ item->setDescriptionText(""+ i18n("Last modified: %1").arg(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").tqarg(KGlobal::locale()->formatDateTime(datetime,false))+"
");
+ item->setDescriptionText(""+ i18n("Last modified: %1").arg(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->tqalignment() | TQt::SingleLine);
+ headerNoteLabel->setAlignment(headerNoteLabel->alignment() | 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").tqarg(KGlobal::locale()->formatDateTime(datetime,false)) + "
";
+ properties = properties + i18n("Start time: %1").arg(KGlobal::locale()->formatDateTime(datetime,false)) + "
";
datetime = datetimeFromString(takeProperty("fixme:endtime",_properties));
- properties = properties + i18n("End time: %1").tqarg(KGlobal::locale()->formatDateTime(datetime,false)) + "
";
+ properties = properties + i18n("End time: %1").arg(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").tqarg(number)+"
";
+ properties=properties+i18n("Business phone: %1").arg(number)+"
";
number = addresseee.phoneNumber(KABC::PhoneNumber::Cell).number();
if (!number.isEmpty())
- properties=properties+i18n("Mobile phone: %1").tqarg(number)+"
";
+ properties=properties+i18n("Mobile phone: %1").arg(number)+"
";
number = addresseee.phoneNumber(KABC::PhoneNumber::Home).number();
if (!number.isEmpty())
- properties=properties+i18n("Home phone: %1").tqarg(number)+"
";
+ properties=properties+i18n("Home phone: %1").arg(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").tqarg(KGlobal::locale()->formatDateTime(received_datetime,false))+"");
+ item->setDescriptionText(""+i18n("Received: %1").arg(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->tqalignment() | TQt::SingleLine);
+ headerLabel->setAlignment(headerLabel->alignment() | 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->tqalignment() | TQt::SingleLine);
+ headerLabel->setAlignment(headerLabel->alignment() | 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").tqarg(KGlobal::locale()->formatDateTime(datetime,false)+""));
+ item->setDescriptionText(""+i18n("Date: %1").arg(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").tqarg(person.isEmpty() ? i18n("Unknown Person") : person));
+ headerFileLabel->setText(i18n("Conversation With %1").arg(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->tqalignment() | TQt::SingleLine);
+ headerLabel->setAlignment(headerLabel->alignment() | TQt::SingleLine);
item->insertHeaderWidget(1,headerLabel);
KerryLabel *headerFileLabel = new KerryLabel(item);
headerFileLabel->setText(homepage);
- headerFileLabel->setAlignment(headerFileLabel->tqalignment() | TQt::SingleLine);
+ headerFileLabel->setAlignment(headerFileLabel->alignment() | 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").tqarg(KGlobal::locale()->formatDateTime(datetimeFromString(install_time_str),false))+"
";
+ properties=properties+i18n("Installed on: %1").arg(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").tqarg(formatBytes(install_size_str))+"
";
+ properties=properties+i18n("Installed size: %1").arg(formatBytes(install_size_str))+"
";
}
TQString download_size_str = takeProperty("fixme:size", _properties);
if (!download_size_str.isEmpty())
{
- properties=properties+i18n("Download size: %1").tqarg(formatBytes(download_size_str))+"
";
+ properties=properties+i18n("Download size: %1").arg(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->tqalignment() | TQt::SingleLine);
+ headerLabel->setAlignment(headerLabel->alignment() | 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").tqarg(KGlobal::locale()->formatDateTime(datetime,false));
+ title = i18n("Last modified: %1").arg(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->tqalignment() | TQt::SingleLine);
+ headerLabel->setAlignment(headerLabel->alignment() | 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").tqarg(KGlobal::locale()->formatDateTime(datetime,false));
+ title = i18n("Last modified: %1").arg(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
").tqarg(result->score,0,'f',1));
+ item->score->setText(i18n("Score: %1
").arg(result->score,0,'f',1));
tableHits->insertItem(item,index);
}
@@ -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.").tqarg(current_query.get()));
+ headerLabel->setText(i18n("No results for \"%1\" were found.").arg(current_query.get()));
item->insertHeaderWidget(0,headerLabel);
item->setIcon("messagebox_warning");
diff --git a/kerry/src/searchdlg_layout.ui b/kerry/src/searchdlg_layout.ui
index a27eab6..ed21038 100644
--- a/kerry/src/searchdlg_layout.ui
+++ b/kerry/src/searchdlg_layout.ui
@@ -189,7 +189,7 @@
Results <b>%1 through %2 of %3</b> are shown.
-
+
AlignVCenter
@@ -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
@@ -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
@@ -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
@@ -849,14 +849,14 @@
update()
update(int,int,int,int)
update(const QRect&)
- 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)
+ 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)
show()
hide()
setShown(bool)
@@ -921,7 +921,7 @@
setTextWorkaround(const QString&)
name
enabled
- tqgeometry
+ geometry
sizePolicy
minimumSize
maximumSize
@@ -950,7 +950,7 @@
frame
echoMode
cursorPosition
- tqalignment
+ alignment
dragEnabled
readOnly
inputMask
@@ -995,14 +995,14 @@
update()
update(int,int,int,int)
update(const QRect&)
- 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)
+ 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)
show()
hide()
setShown(bool)
@@ -1036,7 +1036,7 @@
slotSettingsChanged(int)
name
enabled
- tqgeometry
+ geometry
sizePolicy
minimumSize
maximumSize