1 files changed, 2 insertions, 1 deletions
diff --git a/cervisia/mergedlg.h b/cervisia/mergedlg.h
index 47869b40..58327b74 100644
--- a/cervisia/mergedlg.h
+++ b/cervisia/mergedlg.h
@@ -34,10 +34,11 @@ class CvsService_stub;
 class MergeDialog : public KDialogBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
     MergeDialog( CvsService_stub* service,
-                 TQWidget *parent=0, const char *name=0 );
+                 TQWidget *tqparent=0, const char *name=0 );
 
     bool byBranch() const;
     TQString branch() const;