summaryrefslogtreecommitdiffstats
path: root/tdelirc/tdelirc
diff options
context:
space:
mode:
Diffstat (limited to 'tdelirc/tdelirc')
-rw-r--r--tdelirc/tdelirc/profileserver.cpp4
-rw-r--r--tdelirc/tdelirc/prototype.h2
-rw-r--r--tdelirc/tdelirc/remoteserver.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/tdelirc/tdelirc/profileserver.cpp b/tdelirc/tdelirc/profileserver.cpp
index ba39442..7e41e8e 100644
--- a/tdelirc/tdelirc/profileserver.cpp
+++ b/tdelirc/tdelirc/profileserver.cpp
@@ -66,7 +66,7 @@ void Profile::loadFromFile(const TQString &fileName)
curPAA = 0;
TQFile xmlFile(fileName);
- TQXmlInputSource source(TQT_TQIODEVICE(&xmlFile));
+ TQXmlInputSource source(&xmlFile);
TQXmlSimpleReader reader;
reader.setContentHandler(this);
reader.parse(source);
@@ -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(tqMakePair(attributes.value("min").toInt(), attributes.value("max").toInt()));
+ curPAA->setRange(qMakePair(attributes.value("min").toInt(), attributes.value("max").toInt()));
charBuffer = "";
return true;
diff --git a/tdelirc/tdelirc/prototype.h b/tdelirc/tdelirc/prototype.h
index fa101b7..3c86025 100644
--- a/tdelirc/tdelirc/prototype.h
+++ b/tdelirc/tdelirc/prototype.h
@@ -30,7 +30,7 @@ class Prototype
public:
unsigned count() const{ return theTypes.count(); }
- const TQPair<TQString, TQString> operator[](int i) const { return tqMakePair(theTypes[i], theNames[i]); }
+ const TQPair<TQString, TQString> operator[](int i) const { return qMakePair(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/tdelirc/tdelirc/remoteserver.cpp b/tdelirc/tdelirc/remoteserver.cpp
index dafa67d..e197578 100644
--- a/tdelirc/tdelirc/remoteserver.cpp
+++ b/tdelirc/tdelirc/remoteserver.cpp
@@ -58,7 +58,7 @@ void Remote::loadFromFile(const TQString &fileName)
curRB = 0;
TQFile xmlFile(fileName);
- TQXmlInputSource source(TQT_TQIODEVICE(&xmlFile));
+ TQXmlInputSource source(&xmlFile);
TQXmlSimpleReader reader;
reader.setContentHandler(this);
reader.parse(source);