diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-16 19:02:47 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-16 19:02:47 +0000 |
commit | e985f7e545f4739493965aad69bbecb136dc9346 (patch) | |
tree | 54afd409d8acd6202dd8ab611d24e78c28e4c0a0 /kommander/editor/paletteeditoradvancedimpl.cpp | |
parent | f7670c198945adc3b95ad69a959fe5f8ae55b493 (diff) | |
download | tdewebdev-e985f7e545f4739493965aad69bbecb136dc9346.tar.gz tdewebdev-e985f7e545f4739493965aad69bbecb136dc9346.zip |
TQt4 port kdewebdev
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1237029 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kommander/editor/paletteeditoradvancedimpl.cpp')
-rw-r--r-- | kommander/editor/paletteeditoradvancedimpl.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/kommander/editor/paletteeditoradvancedimpl.cpp b/kommander/editor/paletteeditoradvancedimpl.cpp index 69c90c33..243576c2 100644 --- a/kommander/editor/paletteeditoradvancedimpl.cpp +++ b/kommander/editor/paletteeditoradvancedimpl.cpp @@ -1,7 +1,7 @@ /********************************************************************** ** 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 @@ -35,7 +35,7 @@ Class used by PaletteEditor for bold combobox items */ -class BoldListBoxText : public QListBoxText +class BoldListBoxText : public TQListBoxText { public: BoldListBoxText( TQString text, TQListBox* lb = 0 ); @@ -59,9 +59,9 @@ void BoldListBoxText::paint( TQPainter* painter ) TQListBoxText::paint( painter ); } -PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * parent, +PaletteEditorAdvanced::PaletteEditorAdvanced( FormWindow *fw, TQWidget * tqparent, const char * name, bool modal, WFlags f ) - : PaletteEditorAdvancedBase( parent, name, modal, f ), formWindow( fw ), selectedPalette(0) + : PaletteEditorAdvancedBase( tqparent, name, modal, f ), formWindow( fw ), selectedPalette(0) { connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) ); @@ -244,15 +244,15 @@ void PaletteEditorAdvanced::onCentral( int item ) case 0: default: c = editPalette.active().color( centralFromItem(item) ); - p = editPalette.active().brush( centralFromItem(item) ).pixmap(); + p = editPalette.active().tqbrush( centralFromItem(item) ).pixmap(); break; case 1: c = editPalette.inactive().color( centralFromItem(item) ); - p = editPalette.inactive().brush( centralFromItem(item) ).pixmap(); + p = editPalette.inactive().tqbrush( centralFromItem(item) ).pixmap(); break; case 2: c = editPalette.disabled().color( centralFromItem(item) ); - p = editPalette.disabled().brush( centralFromItem(item) ).pixmap(); + p = editPalette.disabled().tqbrush( centralFromItem(item) ).pixmap(); break; } @@ -508,17 +508,17 @@ void PaletteEditorAdvanced::updateStyledButtons() default: central = editPalette.active().color( centralFromItem( comboCentral->currentItem() ) ); effect = editPalette.active().color( effectFromItem( comboEffect->currentItem() ) ); - pm = editPalette.active().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap(); + pm = editPalette.active().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap(); break; case 1: central = editPalette.inactive().color( centralFromItem( comboCentral->currentItem() ) ); effect = editPalette.inactive().color( effectFromItem( comboEffect->currentItem() ) ); - pm = editPalette.inactive().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap(); + pm = editPalette.inactive().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap(); break; case 2: central = editPalette.disabled().color( centralFromItem( comboCentral->currentItem() ) ); effect = editPalette.disabled().color( effectFromItem( comboEffect->currentItem() ) ); - pm = editPalette.disabled().brush( centralFromItem( comboCentral->currentItem() ) ).pixmap(); + pm = editPalette.disabled().tqbrush( centralFromItem( comboCentral->currentItem() ) ).pixmap(); break; } @@ -613,10 +613,10 @@ void PaletteEditorAdvanced::setupBackgroundMode( BackgroundMode mode ) } TQPalette PaletteEditorAdvanced::getPalette( bool *ok, const TQPalette &init, - BackgroundMode mode, TQWidget* parent, + BackgroundMode mode, TQWidget* tqparent, const char* name, FormWindow *fw ) { - PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( fw, parent, name, true ); + PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( fw, tqparent, name, true ); dlg->setupBackgroundMode( mode ); if ( init != TQPalette() ) |