From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 14 Jun 2011 16:45:05 +0000 Subject: 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 --- kdevdesigner/designer/menubareditor.h | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'kdevdesigner/designer/menubareditor.h') diff --git a/kdevdesigner/designer/menubareditor.h b/kdevdesigner/designer/menubareditor.h index 6dbf86f2..6932fe44 100644 --- a/kdevdesigner/designer/menubareditor.h +++ b/kdevdesigner/designer/menubareditor.h @@ -1,15 +1,15 @@ /********************************************************************** ** Copyright (C) 2003 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. @@ -34,21 +34,22 @@ class PopupMenuEditor; class MenuBarEditor; class TQActionGroup; -class MenuBarEditorItem : public QObject +class MenuBarEditorItem : public TQObject { Q_OBJECT + TQ_OBJECT friend class MenuBarEditor; - MenuBarEditorItem( MenuBarEditor * bar = 0, TQObject * parent = 0, const char * name = 0 ); + MenuBarEditorItem( MenuBarEditor * bar = 0, TQObject * tqparent = 0, const char * name = 0 ); public: MenuBarEditorItem( PopupMenuEditor * menu, MenuBarEditor * bar, - TQObject * parent = 0, const char * name = 0); + TQObject * tqparent = 0, const char * name = 0); MenuBarEditorItem( TQActionGroup * actionGroup, MenuBarEditor * bar, - TQObject * parent = 0, const char * name = 0); + TQObject * tqparent = 0, const char * name = 0); MenuBarEditorItem( MenuBarEditorItem * item, - TQObject * parent = 0, const char * name = 0); + TQObject * tqparent = 0, const char * name = 0); ~MenuBarEditorItem() { }; PopupMenuEditor * menu() { return popupMenu; } @@ -78,12 +79,13 @@ private: class TQLineEdit; class FormWindow; -class MenuBarEditor : public QMenuBar +class MenuBarEditor : public TQMenuBar { Q_OBJECT + TQ_OBJECT public: - MenuBarEditor( FormWindow * fw, TQWidget * parent = 0, const char * name = 0 ); + MenuBarEditor( FormWindow * fw, TQWidget * tqparent = 0, const char * name = 0 ); ~MenuBarEditor(); FormWindow * formWindow(); @@ -118,9 +120,9 @@ public: void focusItem( int index = -1 ); void deleteItem( int index = -1 ); - TQSize sizeHint() const; - TQSize minimumSize() const { return sizeHint(); } - TQSize minimumSizeHint() const { return sizeHint(); } + TQSize tqsizeHint() const; + TQSize tqminimumSize() const { return tqsizeHint(); } + TQSize tqminimumSizeHint() const { return tqsizeHint(); } int heightForWidth( int max_width ) const; void show(); -- cgit v1.2.3