summaryrefslogtreecommitdiffstats
path: root/lib/plugin.cc
diff options
context:
space:
mode:
Diffstat (limited to 'lib/plugin.cc')
-rw-r--r--lib/plugin.cc62
1 files changed, 31 insertions, 31 deletions
diff --git a/lib/plugin.cc b/lib/plugin.cc
index fc24e9f..49c17e7 100644
--- a/lib/plugin.cc
+++ b/lib/plugin.cc
@@ -39,12 +39,12 @@
#include <tqfileinfo.h>
#include <tqhbox.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqregexp.h>
#include <tqstringlist.h>
#include <tqtabwidget.h>
-#include <tqtextview.h>
+#include <textview.h>
#include <tqtimer.h>
#include <dcopclient.h>
@@ -91,7 +91,7 @@ ConduitConfigBase::~ConduitConfigBase()
FUNCTIONSETUP;
return i18n("<qt>The <i>%1</i> conduit's settings have been changed. Do you "
- "want to save the changes before continuing?</qt>").tqarg(this->conduitName());
+ "want to save the changes before continuing?</qt>").arg(this->conduitName());
}
/* virtual */ bool ConduitConfigBase::maybeSave()
@@ -102,7 +102,7 @@ ConduitConfigBase::~ConduitConfigBase()
int r = KMessageBox::questionYesNoCancel(fWidget,
maybeSaveText(),
- i18n("%1 Conduit").tqarg(this->conduitName()), KStdGuiItem::save(), KStdGuiItem::discard());
+ i18n("%1 Conduit").arg(this->conduitName()), KStdGuiItem::save(), KStdGuiItem::discard());
if (r == KMessageBox::Cancel) return false;
if (r == KMessageBox::Yes) commit();
return true;
@@ -126,14 +126,14 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
TQPixmap applicationIcon =
- l->loadIcon(TQString::tqfromLatin1(p->appName()),
+ l->loadIcon(TQString::fromLatin1(p->appName()),
KIcon::Desktop,
64, KIcon::DefaultState, 0L,
true);
if (applicationIcon.isNull())
{
- applicationIcon = l->loadIcon(TQString::tqfromLatin1("kpilot"),
+ applicationIcon = l->loadIcon(TQString::fromLatin1("kpilot"),
KIcon::Desktop);
}
@@ -184,7 +184,7 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
if (!p->homepage().isEmpty())
{
s = TQString();
- s += CSL1("<a href=\"%1\">").tqarg(p->homepage());
+ s += CSL1("<a href=\"%1\">").arg(p->homepage());
s += p->homepage();
s += CSL1("</a><br>");
linktext->append(s);
@@ -192,12 +192,12 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
s = TQString();
s += i18n("Send questions and comments to <a href=\"mailto:%1\">%2</a>.")
- .tqarg( CSL1("tdepim-users@kde.org") )
- .tqarg( CSL1("tdepim-users@kde.org") );
+ .arg( CSL1("tdepim-users@kde.org") )
+ .arg( CSL1("tdepim-users@kde.org") );
s += ' ';
s += i18n("Send bug reports to <a href=\"mailto:%1\">%2</a>.")
- .tqarg(p->bugAddress())
- .tqarg(p->bugAddress());
+ .arg(p->bugAddress())
+ .arg(p->bugAddress());
s += ' ';
s += i18n("For trademark information, see the "
"<a href=\"help:/kpilot/trademarks.html\">KPilot User's Guide</a>.");
@@ -218,9 +218,9 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
for (i=pl.begin(); i!=pl.end(); ++i)
{
s.append(CSL1("%1 (<i>%2</i>)%3")
- .tqarg((*i).name())
- .tqarg((*i).task())
- .tqarg(count<pl.count() ? comma : TQString())
+ .arg((*i).name())
+ .arg((*i).task())
+ .arg(count<pl.count() ? comma : TQString())
);
count++;
}
@@ -235,9 +235,9 @@ TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
for (i=pl.begin(); i!=pl.end(); ++i)
{
s.append(CSL1("%1 (<i>%2</i>)%3")
- .tqarg((*i).name())
- .tqarg((*i).task())
- .tqarg(count<pl.count() ? comma : TQString())
+ .arg((*i).name())
+ .arg((*i).task())
+ .arg(count<pl.count() ? comma : TQString())
);
count++;
}
@@ -485,8 +485,8 @@ void ConduitAction::finished()
if (hhVolatility > allowedVolatility)
{
- query = query.tqarg(fConduitName)
- .tqarg(fCtrHH->type()).tqarg(fCtrHH->moo());
+ query = query.arg(fConduitName)
+ .arg(fCtrHH->type()).arg(fCtrHH->moo());
DEBUGKPILOT << fname << ": Yikes, lots of volatility "
<< "caught. Check with user: [" << query
@@ -533,7 +533,7 @@ ConduitProxy::ConduitProxy(KPilotLink *p,
WARNINGKPILOT << "Can't find desktop file for conduit "
<< fDesktopName
<< endl;
- addSyncLogEntry(i18n("Could not find conduit %1.").tqarg(fDesktopName));
+ addSyncLogEntry(i18n("Could not find conduit %1.").arg(fDesktopName));
return false;
}
@@ -556,7 +556,7 @@ ConduitProxy::ConduitProxy(KPilotLink *p,
<< " - "
<< KLibLoader::self()->lastErrorMessage()
<< endl;
- addSyncLogEntry(i18n("Could not load conduit %1.").tqarg(fDesktopName));
+ addSyncLogEntry(i18n("Could not load conduit %1.").arg(fDesktopName));
return false;
}
@@ -568,7 +568,7 @@ ConduitProxy::ConduitProxy(KPilotLink *p,
<< " has version "
<< version
<< endl;
- addSyncLogEntry(i18n("Conduit %1 has wrong version (%2).").tqarg(fDesktopName).tqarg(version));
+ addSyncLogEntry(i18n("Conduit %1 has wrong version (%2).").arg(fDesktopName).arg(version));
return false;
}
@@ -578,7 +578,7 @@ ConduitProxy::ConduitProxy(KPilotLink *p,
WARNINGKPILOT << "Can't find factory in library "
<< fLibraryName
<< endl;
- addSyncLogEntry(i18n("Could not initialize conduit %1.").tqarg(fDesktopName));
+ addSyncLogEntry(i18n("Could not initialize conduit %1.").arg(fDesktopName));
return false;
}
@@ -591,7 +591,7 @@ ConduitProxy::ConduitProxy(KPilotLink *p,
if (!object)
{
WARNINGKPILOT << "Can't create SyncAction." << endl;
- addSyncLogEntry(i18n("Could not create conduit %1.").tqarg(fDesktopName));
+ addSyncLogEntry(i18n("Could not create conduit %1.").arg(fDesktopName));
return false;
}
@@ -600,11 +600,11 @@ ConduitProxy::ConduitProxy(KPilotLink *p,
if (!fConduit)
{
WARNINGKPILOT << "Can't cast to ConduitAction." << endl;
- addSyncLogEntry(i18n("Could not create conduit %1.").tqarg(fDesktopName));
+ addSyncLogEntry(i18n("Could not create conduit %1.").arg(fDesktopName));
return false;
}
- addSyncLogEntry(i18n("[Conduit %1]").tqarg(fDesktopName));
+ addSyncLogEntry(i18n("[Conduit %1]").arg(fDesktopName));
// Handle the syncDone signal properly & unload the conduit.
TQObject::connect(fConduit,TQT_SIGNAL(syncDone(SyncAction *)),
@@ -706,7 +706,7 @@ TQString findArgument(const TQStringList &a, const TQString &arg)
if (!lib->hasSymbol(symbol.latin1())) return TQString();
- return TQString::tqfromLatin1(*((const char **)(lib->symbol(symbol.latin1()))));
+ return TQString::fromLatin1(*((const char **)(lib->symbol(symbol.latin1()))));
}
@@ -746,11 +746,11 @@ void CUDCounter::setEndCount(unsigned int t)
TQString CUDCounter::moo() const
{
TQString result = fType + ": " +
- i18n("Start: %1. End: %2. ").tqarg(fStart).tqarg(fEnd);
+ i18n("Start: %1. End: %2. ").arg(fStart).arg(fEnd);
- if (fC > 0) result += i18n("%1 new. ").tqarg(fC);
- if (fU > 0) result += i18n("%1 changed. ").tqarg(fU);
- if (fD > 0) result += i18n("%1 deleted. ").tqarg(fD);
+ if (fC > 0) result += i18n("%1 new. ").arg(fC);
+ if (fU > 0) result += i18n("%1 changed. ").arg(fU);
+ if (fD > 0) result += i18n("%1 deleted. ").arg(fD);
if ( (fC+fU+fD) <= 0) result += i18n("No changes made. ");