TQt4 port kdevelop

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 18 insertions, 15 deletions

diff --git a/kdevdesigner/designer/multilineeditorimpl.h b/kdevdesigner/designer/multilineeditorimpl.h
index 4df9ddbc..b39aea71 100644
--- a/kdevdesigner/designer/multilineeditorimpl.h
+++ b/kdevdesigner/designer/multilineeditorimpl.h
@@ -1,15 +1,15 @@
 /**********************************************************************
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qt Designer.
+** This file is part of TQt Designer.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
-** licenses may use this file in accordance with the Qt Commercial License
+** Licensees holding valid TQt Enterprise Edition or TQt Professional Edition
+** licenses may use this file in accordance with the TQt Commercial License
 ** Agreement provided with the Software.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
@@ -17,7 +17,7 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
-**   information about Qt Commercial License Agreements.
+**   information about TQt Commercial License Agreements.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
@@ -29,30 +29,32 @@
 
 #include <tqaction.h>
 #include <tqtextedit.h>
-#include <private/qrichtext_p.h>
+#include <private/tqrichtext_p.h>
 #include "multilineeditor.h"
 
 class FormWindow;
 class TQToolBar;
-class QTextDocument;
+class TQTextDocument;
 
-class TextEdit : public QTextEdit
+class TextEdit : public TQTextEdit
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    TextEdit( TQWidget *parent = 0, const char *name = 0 );
-    QTextDocument *document() const { return TQTextEdit::document(); }
-    QTextParagraph *paragraph();
+    TextEdit( TQWidget *tqparent = 0, const char *name = 0 );
+    TQTextDocument *document() const { return TQTextEdit::document(); }
+    TQTextParagraph *paragraph();
 
 };
 
-class ToolBarItem : public QAction
+class ToolBarItem : public TQAction
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    ToolBarItem( TQWidget *parent, TQWidget *toolBar,
+    ToolBarItem( TQWidget *tqparent, TQWidget *toolBar,
                  const TQString &label, const TQString &tagstr,
 		 const TQIconSet &icon, const TQKeySequence &key = 0 );
     ~ToolBarItem();
@@ -69,13 +71,14 @@ private:
 class MultiLineEditor : public MultiLineEditorBase
 {
     Q_OBJECT
+  TQ_OBJECT
 
 public:
-    MultiLineEditor( bool call_static, bool richtextMode, TQWidget *parent, TQWidget *editWidget,
-		     FormWindow *fw, const TQString &text = TQString::null );
+    MultiLineEditor( bool call_static, bool richtextMode, TQWidget *tqparent, TQWidget *editWidget,
+		     FormWindow *fw, const TQString &text = TQString() );
     bool useWrapping() const;
     void setUseWrapping( bool );
-    static TQString getText( TQWidget *parent, const TQString &text, bool richtextMode, bool *useWrap );
+    static TQString getText( TQWidget *tqparent, const TQString &text, bool richtextMode, bool *useWrap );
     int exec();
 
 protected slots: