summaryrefslogtreecommitdiffstats
path: root/kig/objects/object_holder.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 04:44:41 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 04:44:41 +0000
commita374efce3a207b39514be3c52264091400ce297e (patch)
tree77bdf654b55826d4f59b53a5621310206bcaead1 /kig/objects/object_holder.h
parentf81a494f3957d5cf38c787973415597941934727 (diff)
downloadtdeedu-a374efce3a207b39514be3c52264091400ce297e.tar.gz
tdeedu-a374efce3a207b39514be3c52264091400ce297e.zip
TQt4 port kdeedu
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236073 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kig/objects/object_holder.h')
-rw-r--r--kig/objects/object_holder.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/kig/objects/object_holder.h b/kig/objects/object_holder.h
index 0afd3892..0666fef1 100644
--- a/kig/objects/object_holder.h
+++ b/kig/objects/object_holder.h
@@ -77,7 +77,7 @@ public:
void setNameCalcer( ObjectConstCalcer* namecalcer );
/**
- * returns TQString::null if no name is set.
+ * returns TQString() if no name is set.
*/
const TQString name() const;
/**
@@ -103,7 +103,7 @@ public:
/**
* Returns whether this object contains the point \p p .
*/
- bool contains( const Coordinate& p, const KigWidget& w, bool nv = false ) const;
+ bool tqcontains( const Coordinate& p, const KigWidget& w, bool nv = false ) const;
/**
* Returns whether this object is in the rectangle \p r .
*/