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/paletteeditorimpl.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'kdevdesigner/designer/paletteeditorimpl.h') diff --git a/kdevdesigner/designer/paletteeditorimpl.h b/kdevdesigner/designer/paletteeditorimpl.h index ed911faa..ed1756ed 100644 --- a/kdevdesigner/designer/paletteeditorimpl.h +++ b/kdevdesigner/designer/paletteeditorimpl.h @@ -1,15 +1,15 @@ /********************************************************************** ** Copyright (C) 2000-2002 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,13 +34,14 @@ class FormWindow; class PaletteEditor : public PaletteEditorBase { Q_OBJECT + TQ_OBJECT public: - PaletteEditor( FormWindow *fw, TQWidget * parent=0, const char * name=0, bool modal=FALSE, WFlags f=0 ); + PaletteEditor( FormWindow *fw, TQWidget * tqparent=0, const char * name=0, bool modal=FALSE, WFlags f=0 ); ~PaletteEditor(); static TQPalette getPalette( bool *ok, const TQPalette &pal, BackgroundMode mode = PaletteBackground, - TQWidget* parent = 0, const char* name = 0, FormWindow *fw = 0 ); + TQWidget* tqparent = 0, const char* name = 0, FormWindow *fw = 0 ); protected slots: void onChooseMainColor(); -- cgit v1.2.3