2 files changed, 9 insertions, 9 deletions
diff --git a/languages/cpp/debugger/gdbcommand.h b/languages/cpp/debugger/gdbcommand.h
index 7000235a..946bc3aa 100644
--- a/languages/cpp/debugger/gdbcommand.h
+++ b/languages/cpp/debugger/gdbcommand.h
@@ -91,8 +91,8 @@ public:
 
 private:
     TQString command_;
-    TQGuardedPtr<TQT_BASE_OBJECT_NAME> handler_this;
-    typedef void (TQT_BASE_OBJECT_NAME::* handler_t)(const GDBMI::ResultRecord&);
+    TQGuardedPtr<TQObject> handler_this;
+    typedef void (TQObject::* handler_t)(const GDBMI::ResultRecord&);
     handler_t handler_method;
     TQValueVector<TQString> lines;
     bool run;
@@ -153,8 +153,8 @@ public: // GDBCommand overrides
     bool invokeHandler(const GDBMI::ResultRecord& r);
 
 private:
-		TQGuardedPtr<TQT_BASE_OBJECT_NAME> cli_handler_this;
-    typedef void (TQT_BASE_OBJECT_NAME::* cli_handler_t)(const TQValueVector<TQString>&);
+		TQGuardedPtr<TQObject> cli_handler_this;
+    typedef void (TQObject::* cli_handler_t)(const TQValueVector<TQString>&);
     cli_handler_t cli_handler_method;
 };
 
@@ -165,7 +165,7 @@ private:
 class SentinelCommand : public GDBCommand
 {
 public:
-    typedef void (TQT_BASE_OBJECT_NAME::*handler_method_t)();
+    typedef void (TQObject::*handler_method_t)();
 
     template<class Handler>
     SentinelCommand(Handler* handler_this,
@@ -186,7 +186,7 @@ public:
     }
 
 private:
-		TQGuardedPtr<TQT_BASE_OBJECT_NAME> handler_this;
+		TQGuardedPtr<TQObject> handler_this;
     handler_method_t handler_method;
 
 };
@@ -207,7 +207,7 @@ private:
 class ExpressionValueCommand : public TQObject, public GDBCommand
 {
 public:
-    typedef void (TQT_BASE_OBJECT_NAME::*handler_method_t)(const TQString&);
+    typedef void (TQObject::*handler_method_t)(const TQString&);
 
     template<class Handler>
     ExpressionValueCommand(
@@ -226,7 +226,7 @@ public:
     }
 
 private:
-		TQGuardedPtr<TQT_BASE_OBJECT_NAME> handler_this;
+		TQGuardedPtr<TQObject> handler_this;
     handler_method_t handler_method;
 };
 
diff --git a/languages/cpp/debugger/memviewdlg.cpp b/languages/cpp/debugger/memviewdlg.cpp
index 616b374f..42ad9d4c 100644
--- a/languages/cpp/debugger/memviewdlg.cpp
+++ b/languages/cpp/debugger/memviewdlg.cpp
@@ -466,7 +466,7 @@ namespace GDBDebugger
         TQValueVector<MemoryView*>::iterator i, e;
         for(i = memoryViews_.begin(), e = memoryViews_.end(); i != e; ++i)
         {
-            if (TQT_BASE_OBJECT(*i) == TQT_BASE_OBJECT(child))
+            if (*i == child)
             {
                 memoryViews_.erase(i);
                 break;