summaryrefslogtreecommitdiffstats
path: root/kabc/locknull.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:46:43 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-07-31 19:46:43 +0000
commitffe8a83e053396df448e9413828527613ca3bd46 (patch)
treea73d4169e02df4a50f9a12cb165fcd0ab5bac7c6 /kabc/locknull.cpp
parent682bf3bfdcbcbb1fca85e8a36ed03e062e0555d5 (diff)
downloadtdelibs-ffe8a83e053396df448e9413828527613ca3bd46.tar.gz
tdelibs-ffe8a83e053396df448e9413828527613ca3bd46.zip
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1157647 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kabc/locknull.cpp')
-rw-r--r--kabc/locknull.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kabc/locknull.cpp b/kabc/locknull.cpp
index 1df269a24..234c2c214 100644
--- a/kabc/locknull.cpp
+++ b/kabc/locknull.cpp
@@ -27,7 +27,7 @@
using namespace KABC;
LockNull::LockNull( bool allowAccess )
- : Lock( QString::null ), mAllowAccess( allowAccess )
+ : Lock( TQString::null ), mAllowAccess( allowAccess )
{
}
@@ -54,7 +54,7 @@ bool LockNull::unlock()
return true;
}
-QString LockNull::error() const
+TQString LockNull::error() const
{
if ( mAllowAccess )
return i18n("LockNull: All locks succeed but no actual locking is done.");