summaryrefslogtreecommitdiffstats
path: root/kdelirc/kdelirc
diff options
context:
space:
mode:
Diffstat (limited to 'kdelirc/kdelirc')
-rw-r--r--kdelirc/kdelirc/iraction.cpp2
-rw-r--r--kdelirc/kdelirc/iraction.h2
-rw-r--r--kdelirc/kdelirc/mode.cpp4
-rw-r--r--kdelirc/kdelirc/mode.h2
-rw-r--r--kdelirc/kdelirc/modes.cpp8
-rw-r--r--kdelirc/kdelirc/profileserver.cpp6
-rw-r--r--kdelirc/kdelirc/profileserver.h20
-rw-r--r--kdelirc/kdelirc/prototype.h2
-rw-r--r--kdelirc/kdelirc/remoteserver.cpp2
-rw-r--r--kdelirc/kdelirc/remoteserver.h2
10 files changed, 25 insertions, 25 deletions
diff --git a/kdelirc/kdelirc/iraction.cpp b/kdelirc/kdelirc/iraction.cpp
index ad558b5..f774bc4 100644
--- a/kdelirc/kdelirc/iraction.cpp
+++ b/kdelirc/kdelirc/iraction.cpp
@@ -97,7 +97,7 @@ const TQString IRAction::function() const
if(theObject.isEmpty())
return i18n("Exit mode");
else
- return i18n("Switch to %1").arg(theObject);
+ return i18n("Switch to %1").tqarg(theObject);
else
if(theObject.isEmpty())
return i18n("Just start");
diff --git a/kdelirc/kdelirc/iraction.h b/kdelirc/kdelirc/iraction.h
index 8fdd44e..7d70d6c 100644
--- a/kdelirc/kdelirc/iraction.h
+++ b/kdelirc/kdelirc/iraction.h
@@ -82,7 +82,7 @@ public:
void setUnique(const bool a) { theUnique = a; }
IRAction(const TQString &newProgram, const TQString &newObject, const TQString &newMethod, const Arguments &newArguments, const TQString &newRemote, const TQString &newMode, const TQString &newButton, const bool newRepeat, const bool newAutoStart, const bool newDoBefore, const bool newDoAfter, const bool newUnique, const IfMulti newIfMulti);
- IRAction() { theProgram = TQString::null; }
+ IRAction() { theProgram = TQString(); }
};
#endif
diff --git a/kdelirc/kdelirc/mode.cpp b/kdelirc/kdelirc/mode.cpp
index 71deea8..cd0dc4c 100644
--- a/kdelirc/kdelirc/mode.cpp
+++ b/kdelirc/kdelirc/mode.cpp
@@ -16,7 +16,7 @@
#include "modes.h"
#include "mode.h"
-Mode::Mode() : theName(TQString::null)
+Mode::Mode() : theName(TQString())
{
}
@@ -37,7 +37,7 @@ const Mode &Mode::loadFromConfig(KConfig &theConfig, int index)
theName = theConfig.readEntry(Prefix + "Name");
theRemote = theConfig.readEntry(Prefix + "Remote");
theIconFile = theConfig.readEntry(Prefix + "IconFile");
- if(theIconFile.isEmpty()) theIconFile = TQString::null;
+ if(theIconFile.isEmpty()) theIconFile = TQString();
return *this;
}
diff --git a/kdelirc/kdelirc/mode.h b/kdelirc/kdelirc/mode.h
index 9a73fbc..a2fa477 100644
--- a/kdelirc/kdelirc/mode.h
+++ b/kdelirc/kdelirc/mode.h
@@ -43,7 +43,7 @@ public:
bool operator==(const Mode &mode) const { return mode.theName == theName && mode.theRemote == theRemote; }
Mode();
- Mode(const TQString &remote, const TQString &name, const TQString &iconFile = TQString::null);
+ Mode(const TQString &remote, const TQString &name, const TQString &iconFile = TQString());
~Mode();
};
diff --git a/kdelirc/kdelirc/modes.cpp b/kdelirc/kdelirc/modes.cpp
index 5346837..5ecd418 100644
--- a/kdelirc/kdelirc/modes.cpp
+++ b/kdelirc/kdelirc/modes.cpp
@@ -41,8 +41,8 @@ void Modes::loadFromConfig(KConfig &theConfig)
void Modes::generateNulls(const TQStringList &theRemotes)
{
for(TQStringList::const_iterator i = theRemotes.begin(); i != theRemotes.end(); ++i)
- { if(!contains(*i) || !operator[](*i).contains("")) operator[](*i)[""] = Mode(*i, "");
- if(!theDefaults.contains(*i)) theDefaults[*i].isEmpty();
+ { if(!tqcontains(*i) || !operator[](*i).tqcontains("")) operator[](*i)[""] = Mode(*i, "");
+ if(!theDefaults.tqcontains(*i)) theDefaults[*i].isEmpty();
}
}
@@ -59,8 +59,8 @@ const Mode Modes::getDefault(const TQString &remote) const
{
// if(theDefaults[remote] == TQString())
// return Mode(remote, "");
- if(contains(remote))
- if(operator[](remote).contains(theDefaults[remote]))
+ if(tqcontains(remote))
+ if(operator[](remote).tqcontains(theDefaults[remote]))
return operator[](remote)[theDefaults[remote]];
else return Mode(remote, "");
else return Mode(remote, "");
diff --git a/kdelirc/kdelirc/profileserver.cpp b/kdelirc/kdelirc/profileserver.cpp
index 7a72c4d..d95c5d5 100644
--- a/kdelirc/kdelirc/profileserver.cpp
+++ b/kdelirc/kdelirc/profileserver.cpp
@@ -66,7 +66,7 @@ void Profile::loadFromFile(const TQString &fileName)
curPAA = 0;
TQFile xmlFile(fileName);
- TQXmlInputSource source(&xmlFile);
+ TQXmlInputSource source(TQT_TQIODEVICE(&xmlFile));
TQXmlSimpleReader reader;
reader.setContentHandler(this);
reader.parse(source);
@@ -84,7 +84,7 @@ const TQString &ProfileServer::getServiceName(const TQString &appId) const
{
if(theProfiles[appId])
return theProfiles[appId]->serviceName();
- return TQString::null;
+ return TQString();
}
const ProfileAction *ProfileServer::getAction(const TQString &appId, const TQString &objId, const TQString &prototype) const
@@ -124,7 +124,7 @@ bool Profile::startElement(const TQString &, const TQString &, const TQString &n
curPAA->setType(attributes.value("type"));
}
else if(name == "range" && curPAA)
- curPAA->setRange(qMakePair(attributes.value("min").toInt(), attributes.value("max").toInt()));
+ curPAA->setRange(tqMakePair(attributes.value("min").toInt(), attributes.value("max").toInt()));
charBuffer = "";
return true;
diff --git a/kdelirc/kdelirc/profileserver.h b/kdelirc/kdelirc/profileserver.h
index 0228082..f049ad4 100644
--- a/kdelirc/kdelirc/profileserver.h
+++ b/kdelirc/kdelirc/profileserver.h
@@ -26,7 +26,7 @@
enum IfMulti {IM_DONTSEND, IM_SENDTOALL, IM_SENDTOTOP, IM_SENDTOBOTTOM};
-typedef QPair<int,int> Range;
+typedef TQPair<int,int> Range;
class ProfileAction;
class Profile;
@@ -35,8 +35,8 @@ class ProfileActionArgument
{
TQString theComment, theType;
Range theRange;
- TQString theDefault; // should be QVariant?
- const ProfileAction *parent;
+ TQString theDefault; // should be TQVariant?
+ const ProfileAction *tqparent;
friend class Profile;
public:
@@ -49,15 +49,15 @@ public:
const Range &range() const { return theRange; }
void setRange(const Range &a) { theRange = a; }
- const ProfileAction *action() const { return parent; }
- void setAction(const ProfileAction *a) { parent = a; }
+ const ProfileAction *action() const { return tqparent; }
+ void setAction(const ProfileAction *a) { tqparent = a; }
};
class ProfileAction
{
TQString theObjId, thePrototype, theName, theComment, theClass;
float theMultiplier;
- const Profile *parent;
+ const Profile *tqparent;
bool theRepeat, theAutoStart;
TQValueList<ProfileActionArgument> theArguments;
@@ -81,11 +81,11 @@ public:
void setAutoStart(bool a) { theAutoStart = a; }
const TQValueList<ProfileActionArgument> &arguments() const { return theArguments; }
- const Profile *profile() const { return parent; }
- void setProfile(const Profile *a) { parent = a; }
+ const Profile *profile() const { return tqparent; }
+ void setProfile(const Profile *a) { tqparent = a; }
};
-class Profile : public QXmlDefaultHandler
+class Profile : public TQXmlDefaultHandler
{
TQString theId, theName, theAuthor, theServiceName;
IfMulti theIfMulti;
@@ -112,7 +112,7 @@ public:
void setUnique(const bool a) { theUnique = a; }
const IfMulti ifMulti() const { return theIfMulti; }
void setIfMulti(const IfMulti a) { theIfMulti = a; }
- const TQString &serviceName() const { if(theServiceName != TQString::null) return theServiceName; return theName; }
+ const TQString &serviceName() const { if(theServiceName != TQString()) return theServiceName; return theName; }
void setServiceName(const TQString &a) { theServiceName = a; }
const TQDict<ProfileAction> &actions() const { return theActions; }
const ProfileAction *searchClass(const TQString &c) const;
diff --git a/kdelirc/kdelirc/prototype.h b/kdelirc/kdelirc/prototype.h
index 0a963f7..fa101b7 100644
--- a/kdelirc/kdelirc/prototype.h
+++ b/kdelirc/kdelirc/prototype.h
@@ -30,7 +30,7 @@ class Prototype
public:
unsigned count() const{ return theTypes.count(); }
- const QPair<TQString, TQString> operator[](int i) const { return qMakePair(theTypes[i], theNames[i]); }
+ const TQPair<TQString, TQString> operator[](int i) const { return tqMakePair(theTypes[i], theNames[i]); }
const TQString &name(int i) const { return theNames[i]; }
const TQString &type(int i) const { return theTypes[i]; }
const TQString &returnType() const { return theReturn; }
diff --git a/kdelirc/kdelirc/remoteserver.cpp b/kdelirc/kdelirc/remoteserver.cpp
index db33591..04fb290 100644
--- a/kdelirc/kdelirc/remoteserver.cpp
+++ b/kdelirc/kdelirc/remoteserver.cpp
@@ -58,7 +58,7 @@ void Remote::loadFromFile(const TQString &fileName)
curRB = 0;
TQFile xmlFile(fileName);
- TQXmlInputSource source(&xmlFile);
+ TQXmlInputSource source(TQT_TQIODEVICE(&xmlFile));
TQXmlSimpleReader reader;
reader.setContentHandler(this);
reader.parse(source);
diff --git a/kdelirc/kdelirc/remoteserver.h b/kdelirc/kdelirc/remoteserver.h
index e74b02e..80891ba 100644
--- a/kdelirc/kdelirc/remoteserver.h
+++ b/kdelirc/kdelirc/remoteserver.h
@@ -38,7 +38,7 @@ public:
const TQString &id(void) const { return theId; }
};
-class Remote : public QXmlDefaultHandler
+class Remote : public TQXmlDefaultHandler
{
TQString theName, theId, theAuthor;
TQDict<RemoteButton> theButtons;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 01:29:59 +0000