summaryrefslogtreecommitdiffstats
path: root/kpilot/kpilotConfig.cc
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-01 00:37:32 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-01 00:37:32 +0000
commitf6f9c296c3f9d39a8c3d0ee64a542a47f450be28 (patch)
treed38fce8091ce66977004a5cb115768c7810aee30 /kpilot/kpilotConfig.cc
parente340db64991a06761aa6395ffe760b53e4c1dfbc (diff)
downloadkpilot-f6f9c296c3f9d39a8c3d0ee64a542a47f450be28.tar.gz
kpilot-f6f9c296c3f9d39a8c3d0ee64a542a47f450be28.zip
TQt4 port kpilot
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kpilot@1238903 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kpilot/kpilotConfig.cc')
-rw-r--r--kpilot/kpilotConfig.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/kpilot/kpilotConfig.cc b/kpilot/kpilotConfig.cc
index c5dbad1..cec6382 100644
--- a/kpilot/kpilotConfig.cc
+++ b/kpilot/kpilotConfig.cc
@@ -163,7 +163,7 @@ void KPilotConfig::addFlagsChangedDatabase(TQString db)
s += i18n("The configuration file is outdated.");
s += ' ';
s += i18n("The configuration file has version %1, while KPilot "
- "needs version %2.").arg(fileversion).arg(ConfigurationVersion);
+ "needs version %2.").tqarg(fileversion).tqarg(ConfigurationVersion);
if (run)
{
s += ' ';
@@ -209,7 +209,7 @@ static void update440()
TQStringList conduits( KPilotSettings::installedConduits() );
KConfig*c = KPilotSettings::self()->config();
/// c->resetGroup();
- c->setGroup( TQString::null );
+ c->setGroup( TQString() );
bool installFiles = c->readBoolEntry("SyncFiles",true);
if (installFiles) conduits.append( CSL1("internal_fileinstall") );
c->deleteEntry("SyncFiles");
@@ -234,7 +234,7 @@ static void update440()
const char **s = oldconduits;
while (*s)
{
- TQString libname = CSL1("kde3/lib%1conduit.so").arg(TQString::tqfromLatin1(*s));
+ TQString libname = CSL1("kde3/lib%1conduit.so").tqarg(TQString::tqfromLatin1(*s));
TQString foundlib = ::locate("lib",libname);
if (!foundlib.isEmpty())
{
@@ -270,7 +270,7 @@ static void update443()
{
if ((*i).length()==4)
{
- fixSkip.append(CSL1("[%1]").arg(*i));
+ fixSkip.append(CSL1("[%1]").tqarg(*i));
fixedSome = true;
}
else