diff options
Diffstat (limited to 'kcoloredit')
-rw-r--r-- | kcoloredit/colorselector.cpp | 28 | ||||
-rw-r--r-- | kcoloredit/colorselector.h | 2 | ||||
-rw-r--r-- | kcoloredit/gradientselection.cpp | 16 | ||||
-rw-r--r-- | kcoloredit/gradientselection.h | 2 | ||||
-rw-r--r-- | kcoloredit/imageselection.h | 2 | ||||
-rw-r--r-- | kcoloredit/kcolorchooser.cpp | 2 | ||||
-rw-r--r-- | kcoloredit/kcoloredit.cpp | 54 | ||||
-rw-r--r-- | kcoloredit/kcoloredit.h | 2 | ||||
-rw-r--r-- | kcoloredit/kcoloreditdoc.h | 2 | ||||
-rw-r--r-- | kcoloredit/kcoloreditview.cpp | 12 | ||||
-rw-r--r-- | kcoloredit/kcoloreditview.h | 2 | ||||
-rw-r--r-- | kcoloredit/kxycolorselector.h | 2 | ||||
-rw-r--r-- | kcoloredit/kzcolorselector.cpp | 2 | ||||
-rw-r--r-- | kcoloredit/kzcolorselector.h | 4 | ||||
-rw-r--r-- | kcoloredit/loadpalettedlg.cpp | 4 | ||||
-rw-r--r-- | kcoloredit/loadpalettedlg.h | 2 | ||||
-rw-r--r-- | kcoloredit/paletteview.cpp | 10 | ||||
-rw-r--r-- | kcoloredit/paletteview.h | 2 | ||||
-rw-r--r-- | kcoloredit/paletteviewscrolledarea.cpp | 4 | ||||
-rw-r--r-- | kcoloredit/paletteviewscrolledarea.h | 2 | ||||
-rw-r--r-- | kcoloredit/texteditselection.cpp | 16 | ||||
-rw-r--r-- | kcoloredit/texteditselection.h | 2 |
22 files changed, 87 insertions, 87 deletions
diff --git a/kcoloredit/colorselector.cpp b/kcoloredit/colorselector.cpp index 6dfbf08a..0e85f2d9 100644 --- a/kcoloredit/colorselector.cpp +++ b/kcoloredit/colorselector.cpp @@ -37,16 +37,16 @@ ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(par TQTabWidget* pages = new TQTabWidget(this); */ gradientSelection = new GradientSelection(this); - connect(gradientSelection, TQT_SIGNAL( valueChanged(Color*) ), - TQT_SLOT( slotGradientSelectionChangeColor(Color*) )); - connect(gradientSelection, TQT_SIGNAL( synchronizeColor() ), - TQT_SLOT( slotGradientSelectionSynchronizeColor() )); - connect(this, TQT_SIGNAL( valueChanged(Color*) ), gradientSelection, TQT_SLOT( slotSetValue(Color*) )); + connect(gradientSelection, TQ_SIGNAL( valueChanged(Color*) ), + TQ_SLOT( slotGradientSelectionChangeColor(Color*) )); + connect(gradientSelection, TQ_SIGNAL( synchronizeColor() ), + TQ_SLOT( slotGradientSelectionSynchronizeColor() )); + connect(this, TQ_SIGNAL( valueChanged(Color*) ), gradientSelection, TQ_SLOT( slotSetValue(Color*) )); /* pages->addTab(gradientSelection, i18n( "Gradient" )); ImageSelection* imageSelection = new ImageSelection(this); - connect(imageSelection, TQT_SIGNAL( valueChanged(Color*) ), TQT_SLOT( slotSetColor(Color*) )); - connect(this, TQT_SIGNAL( valueChanged(Color*) ), imageSelection, TQT_SLOT( slotSetValue(Color*) )); + connect(imageSelection, TQ_SIGNAL( valueChanged(Color*) ), TQ_SLOT( slotSetColor(Color*) )); + connect(this, TQ_SIGNAL( valueChanged(Color*) ), imageSelection, TQ_SLOT( slotSetValue(Color*) )); pages->addTab(imageSelection, i18n( "Image" )); topLayout->addWidget(pages, 10); */ @@ -55,17 +55,17 @@ ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(par topLayout->addWidget(hLine); TQHBoxLayout* layout = new TQHBoxLayout(); TextEditSelection* textEditSelection = new TextEditSelection(this); - connect(textEditSelection, TQT_SIGNAL( valueChanged(Color*) ), TQT_SLOT( slotSetColor(Color*) )); - connect(this, TQT_SIGNAL( valueChanged(Color*) ), textEditSelection, TQT_SLOT( slotSetValue(Color*) )); + connect(textEditSelection, TQ_SIGNAL( valueChanged(Color*) ), TQ_SLOT( slotSetColor(Color*) )); + connect(this, TQ_SIGNAL( valueChanged(Color*) ), textEditSelection, TQ_SLOT( slotSetValue(Color*) )); TQVBoxLayout* colorChangeLayout = new TQVBoxLayout(); colorChangeLayout->setMargin(2); TQRadioButton* replaceButton = new TQRadioButton(i18n( "Replace" ), this); - connect(replaceButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotColorReplace() )); + connect(replaceButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotColorReplace() )); replaceButton->setChecked(true); colorChangeButtons.insert(replaceButton); colorChangeLayout->addWidget(replaceButton); TQRadioButton* changeButton = new TQRadioButton(i18n( "Change" ) + ":", this); - connect(changeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotColorChange() )); + connect(changeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotColorChange() )); colorChangeButtons.insert(changeButton); colorChangeLayout->addWidget(changeButton); colorChangeValue = 0; @@ -73,10 +73,10 @@ ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(par TQVBoxLayout* colorChangeSliderLayout = new TQVBoxLayout(colorChangeSliderWidget, 1); colorChangeSliderLayout->setMargin(0); TQSlider* colorChangeSlider = new TQSlider(0, MAX_COLOR_CHANGE_VALUE, - MAX_COLOR_CHANGE_VALUE/4, colorChangeValue, Qt::Horizontal, colorChangeSliderWidget); + MAX_COLOR_CHANGE_VALUE/4, colorChangeValue, TQt::Horizontal, colorChangeSliderWidget); colorChangeSlider->setTickInterval(colorChangeSlider->pageStep()); colorChangeSlider->setTickmarks(TQSlider::Above); - connect(colorChangeSlider, TQT_SIGNAL( valueChanged(int) ), TQT_SLOT( slotColorChangeValueChanged(int) )); + connect(colorChangeSlider, TQ_SIGNAL( valueChanged(int) ), TQ_SLOT( slotColorChangeValueChanged(int) )); colorChangeSliderLayout->addWidget(colorChangeSlider); TQHBoxLayout* colorChangeSliderLabelsLayout = new TQHBoxLayout(0); TQLabel* subtractLabel = new TQLabel(i18n( "0" ), colorChangeSliderWidget); @@ -95,7 +95,7 @@ ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(par layout->addWidget(vLine); layout->addWidget(textEditSelection, 1); colorPatch = new KColorPatch(this); - connect(colorPatch, TQT_SIGNAL( colorChanged(const TQColor&) ), TQT_SLOT( slotSetColor(const TQColor&) )); + connect(colorPatch, TQ_SIGNAL( colorChanged(const TQColor&) ), TQ_SLOT( slotSetColor(const TQColor&) )); colorPatch->setMinimumSize(80, 64); layout->addWidget(colorPatch, 10); topLayout->addLayout(layout); diff --git a/kcoloredit/colorselector.h b/kcoloredit/colorselector.h index 138ba8c3..c0f6f4ee 100644 --- a/kcoloredit/colorselector.h +++ b/kcoloredit/colorselector.h @@ -30,7 +30,7 @@ * @author Artur Rataj */ class ColorSelector : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcoloredit/gradientselection.cpp b/kcoloredit/gradientselection.cpp index df0769d0..3fb4d651 100644 --- a/kcoloredit/gradientselection.cpp +++ b/kcoloredit/gradientselection.cpp @@ -29,8 +29,8 @@ GradientSelection::GradientSelection(TQWidget *parent, const char *name ) : TQWi TQHBoxLayout* layout = new TQHBoxLayout(0); layout->setMargin(3); xyColorSelector = new KXYColorSelector(this); - connect(xyColorSelector, TQT_SIGNAL( valueChanged(int, int) ), - TQT_SLOT( slotXyColorSelectorPosChanged(int, int) )); + connect(xyColorSelector, TQ_SIGNAL( valueChanged(int, int) ), + TQ_SLOT( slotXyColorSelectorPosChanged(int, int) )); layout->addWidget(xyColorSelector); topLayout->addLayout(layout, 0, 0); topLayout->setRowStretch(0, 10); @@ -40,27 +40,27 @@ GradientSelection::GradientSelection(TQWidget *parent, const char *name ) : TQWi checkBoxLayout->setMargin(0); variableCheckBox = new TQCheckBox(i18n( "Variable" ), this); variableGlobalComponent = false; - connect(variableCheckBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotSetVariableGlobalComponent(bool) )); + connect(variableCheckBox, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotSetVariableGlobalComponent(bool) )); checkBoxLayout->addSpacing(2); checkBoxLayout->addWidget(variableCheckBox); xyColorSelectorLayout->addLayout(checkBoxLayout); xyColorSelectorLayout->addStretch(10); TQHBoxLayout* buttonsLayout = new TQHBoxLayout(); synchronizeColorButton = new TQPushButton(i18n( "Synchronize" ), this); - connect(synchronizeColorButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotSynchronizeColor() )); + connect(synchronizeColorButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotSynchronizeColor() )); buttonsLayout->addSpacing(2); buttonsLayout->addWidget(synchronizeColorButton); buttonsLayout->addStretch(10); xyColorSelectorLayout->addLayout(buttonsLayout); xyColorSelectorLayout->addSpacing(2); topLayout->addLayout(xyColorSelectorLayout, 1, 0); - zColorSelector = new KZColorSelector(Qt::Vertical, this); - connect(zColorSelector, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotZColorSelectorPosChanged(int) )); + zColorSelector = new KZColorSelector(TQt::Vertical, this); + connect(zColorSelector, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotZColorSelectorPosChanged(int) )); zColorSelector->setFixedWidth(36); topLayout->addWidget(zColorSelector, 0, 1); TQVBoxLayout* zColorSelectorLayout = new TQVBoxLayout(0); - connect(&hsvButtons, TQT_SIGNAL( clicked(int) ), TQT_SLOT( slotSetColorSelectionMode(int) )); + connect(&hsvButtons, TQ_SIGNAL( clicked(int) ), TQ_SLOT( slotSetColorSelectionMode(int) )); TQRadioButton* hRadioButton = new TQRadioButton("H", this); hsvButtons.insert(hRadioButton, H_COMPONENT); zColorSelectorLayout->addWidget(hRadioButton); diff --git a/kcoloredit/gradientselection.h b/kcoloredit/gradientselection.h index cd47355b..3f98b0cf 100644 --- a/kcoloredit/gradientselection.h +++ b/kcoloredit/gradientselection.h @@ -31,7 +31,7 @@ * @author Artur Rataj */ class GradientSelection : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcoloredit/imageselection.h b/kcoloredit/imageselection.h index 79a3c3fd..7846ef31 100644 --- a/kcoloredit/imageselection.h +++ b/kcoloredit/imageselection.h @@ -26,7 +26,7 @@ * @author Artur Rataj */ class ImageSelection : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcoloredit/kcolorchooser.cpp b/kcoloredit/kcolorchooser.cpp index 50b83f1a..1759cf14 100644 --- a/kcoloredit/kcolorchooser.cpp +++ b/kcoloredit/kcolorchooser.cpp @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) dlg.setColor(TQt::blue); // Just a color - app.connect(&dlg, TQT_SIGNAL(finished()), TQT_SLOT(quit())); + app.connect(&dlg, TQ_SIGNAL(finished()), TQ_SLOT(quit())); dlg.show(); app.exec(); diff --git a/kcoloredit/kcoloredit.cpp b/kcoloredit/kcoloredit.cpp index f933bea9..16f06b89 100644 --- a/kcoloredit/kcoloredit.cpp +++ b/kcoloredit/kcoloredit.cpp @@ -64,40 +64,40 @@ KColorEditApp::~KColorEditApp() { void KColorEditApp::initActions() { // File actiojns - KStdAction::openNew( TQT_TQOBJECT(this), TQT_SLOT( slotFileNew() ), actionCollection() ); - KStdAction::open( TQT_TQOBJECT(this), TQT_SLOT( slotFileOpen() ), actionCollection() ); - KStdAction::saveAs( TQT_TQOBJECT(this), TQT_SLOT( slotFileSaveAs() ), actionCollection() ); - KStdAction::close( TQT_TQOBJECT(this), TQT_SLOT( slotClose() ), actionCollection() ); - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotQuit() ), actionCollection() ); - m_actSave = KStdAction::save( TQT_TQOBJECT(this), TQT_SLOT( slotFileSave() ), + KStdAction::openNew( this, TQ_SLOT( slotFileNew() ), actionCollection() ); + KStdAction::open( this, TQ_SLOT( slotFileOpen() ), actionCollection() ); + KStdAction::saveAs( this, TQ_SLOT( slotFileSaveAs() ), actionCollection() ); + KStdAction::close( this, TQ_SLOT( slotClose() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( slotQuit() ), actionCollection() ); + m_actSave = KStdAction::save( this, TQ_SLOT( slotFileSave() ), actionCollection() ); - m_actRecent = KStdAction::openRecent( TQT_TQOBJECT(this), - TQT_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() ); + m_actRecent = KStdAction::openRecent( this, + TQ_SLOT( slotFileOpenRecent( const KURL& ) ), actionCollection() ); ( void ) new TDEAction( i18n("New &Window"), kapp->miniIcon(), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( slotFileNewWindow() ), actionCollection(), + this, TQ_SLOT( slotFileNewWindow() ), actionCollection(), "file_new_window" ); // Edit actions - m_actCut = KStdAction::cut( TQT_TQOBJECT(this), TQT_SLOT( slotEditCut() ), + m_actCut = KStdAction::cut( this, TQ_SLOT( slotEditCut() ), actionCollection() ); - m_actCopy = KStdAction::copy( TQT_TQOBJECT(this), TQT_SLOT( slotEditCopy() ), + m_actCopy = KStdAction::copy( this, TQ_SLOT( slotEditCopy() ), actionCollection() ); - m_actPaste = KStdAction::paste( TQT_TQOBJECT(this), TQT_SLOT( slotEditPaste() ), + m_actPaste = KStdAction::paste( this, TQ_SLOT( slotEditPaste() ), actionCollection() ); m_actPaste->setEnabled( false ); // Color Menu - m_actNames = new TDEToggleAction( i18n("Show &Color Names"), TDEShortcut(), TQT_TQOBJECT(this), - TQT_SLOT( slotViewColorNames() ), actionCollection(), + m_actNames = new TDEToggleAction( i18n("Show &Color Names"), TDEShortcut(), this, + TQ_SLOT( slotViewColorNames() ), actionCollection(), "color_view_names" ); m_actNames->setCheckedState(i18n("Hide &Color Names")); - m_actPalette = new TDEAction( i18n("From &Palette"), TDEShortcut(), TQT_TQOBJECT(this), - TQT_SLOT( slotColorFromPalette() ), actionCollection(), + m_actPalette = new TDEAction( i18n("From &Palette"), TDEShortcut(), this, + TQ_SLOT( slotColorFromPalette() ), actionCollection(), "color_from_palette" ); - ( void ) new TDEAction( i18n("From &Screen"), TDEShortcut(), TQT_TQOBJECT(this), - TQT_SLOT( slotColorFromScreen() ), actionCollection(), + ( void ) new TDEAction( i18n("From &Screen"), TDEShortcut(), this, + TQ_SLOT( slotColorFromScreen() ), actionCollection(), "color_from_screen" ); } @@ -112,14 +112,14 @@ void KColorEditApp::initDocument() doc = new KColorEditDoc(this); doc->newDocument(); - connect( doc, TQT_SIGNAL( selectionChanged( int, int ) ), - TQT_SLOT( slotSelectionChanged( int, int ) ) ); - connect( doc, TQT_SIGNAL( clipboardChanged() ), - TQT_SLOT( slotClipboardChanged() ) ); - connect( doc, TQT_SIGNAL( modified( bool ) ), - TQT_SLOT( slotModified( bool ) ) ); - connect( doc, TQT_SIGNAL( paletteAvailable( bool ) ), - TQT_SLOT( slotPaletteAvailable( bool ) ) ); + connect( doc, TQ_SIGNAL( selectionChanged( int, int ) ), + TQ_SLOT( slotSelectionChanged( int, int ) ) ); + connect( doc, TQ_SIGNAL( clipboardChanged() ), + TQ_SLOT( slotClipboardChanged() ) ); + connect( doc, TQ_SIGNAL( modified( bool ) ), + TQ_SLOT( slotModified( bool ) ) ); + connect( doc, TQ_SIGNAL( paletteAvailable( bool ) ), + TQ_SLOT( slotPaletteAvailable( bool ) ) ); } void KColorEditApp::initView() @@ -178,7 +178,7 @@ bool KColorEditApp::queryExit() } ///////////////////////////////////////////////////////////////////// -// TQT_SLOT IMPLEMENTATION +// SLOT IMPLEMENTATION ///////////////////////////////////////////////////////////////////// void KColorEditApp::slotSelectionChanged( int begin, int end ) diff --git a/kcoloredit/kcoloredit.h b/kcoloredit/kcoloredit.h index 9da41fc3..75a8b096 100644 --- a/kcoloredit/kcoloredit.h +++ b/kcoloredit/kcoloredit.h @@ -53,7 +53,7 @@ class KColorEditView; */ class KColorEditApp : public TDEMainWindow { - Q_OBJECT + TQ_OBJECT friend class KColorEditView; diff --git a/kcoloredit/kcoloreditdoc.h b/kcoloredit/kcoloreditdoc.h index abb499bf..e4b672ed 100644 --- a/kcoloredit/kcoloreditdoc.h +++ b/kcoloredit/kcoloreditdoc.h @@ -46,7 +46,7 @@ class KColorEditView; */ class KColorEditDoc : public TQObject { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcoloredit/kcoloreditview.cpp b/kcoloredit/kcoloreditview.cpp index ecc29b18..c56de065 100644 --- a/kcoloredit/kcoloreditview.cpp +++ b/kcoloredit/kcoloreditview.cpp @@ -48,15 +48,15 @@ KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter( addColorLayout->setMargin(8); TQHBoxLayout* buttonsLayout = new TQHBoxLayout(4); TQPushButton* addColorButton = new TQPushButton(i18n( "Add Color" ), paletteViewArea); - connect(addColorButton, TQT_SIGNAL( clicked() ), TQT_SLOT( slotAddColor() )); + connect(addColorButton, TQ_SIGNAL( clicked() ), TQ_SLOT( slotAddColor() )); buttonsLayout->addWidget(addColorButton); buttonsLayout->addStretch(10); addColorLayout->addLayout(buttonsLayout); TQCheckBox* atCursorCheckBox = new TQCheckBox(i18n( "At cursor" ), paletteViewArea); - connect(atCursorCheckBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotAddColorAtCursor(bool) )); + connect(atCursorCheckBox, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotAddColorAtCursor(bool) )); addColorLayout->addWidget(atCursorCheckBox); overwriteCheckBox = new TQCheckBox(i18n( "Overwrite" ), paletteViewArea); - connect(overwriteCheckBox, TQT_SIGNAL( toggled(bool) ), TQT_SLOT( slotAddColorOverwrite(bool) )); + connect(overwriteCheckBox, TQ_SIGNAL( toggled(bool) ), TQ_SLOT( slotAddColorOverwrite(bool) )); slotAddColorAtCursor(false); slotAddColorOverwrite(false); addColorLayout->addWidget(overwriteCheckBox); @@ -66,8 +66,8 @@ KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter( //addColorLayout->addStretch(10); //TQCheckBox* cursorFollowsChosenColor = new TQCheckBox(i18n( "Cursor follows" ), paletteViewArea); //addColorLayout->addWidget(cursorFollowsChosenColor); - //connect(cursorFollowsChosenColor, TQT_SIGNAL( toggled(bool) ), - // paletteView, TQT_SLOT( slotCursorFollowsChosenColor(bool) )); + //connect(cursorFollowsChosenColor, TQ_SIGNAL( toggled(bool) ), + // paletteView, TQ_SLOT( slotCursorFollowsChosenColor(bool) )); //cursorFollowsChosenColor->toggle(); paletteView->slotCursorFollowsChosenColor(true); layout->addLayout(addColorLayout, 0); @@ -78,7 +78,7 @@ KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter( TQLabel* nameLabel = new TQLabel(i18n( "Name" ) + ": ", colorAtCursorFrameArea); colorNameLayout->addWidget(nameLabel, 0); colorName = new TQLineEdit(colorAtCursorFrameArea); - connect(colorName, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( slotSetColorName(const TQString&) )); + connect(colorName, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( slotSetColorName(const TQString&) )); colorNameLayout->addWidget(colorName, 10); colorAtCursorLayout->addLayout(colorNameLayout); TQGridLayout* colorAtCursorComponentsLayout = new TQGridLayout(3, 6, 4); diff --git a/kcoloredit/kcoloreditview.h b/kcoloredit/kcoloreditview.h index a41b0a47..003a4087 100644 --- a/kcoloredit/kcoloreditview.h +++ b/kcoloredit/kcoloreditview.h @@ -42,7 +42,7 @@ class KColorEditDoc; * @version KDevelop version 0.4 code generation */ class KColorEditView : public TQSplitter { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcoloredit/kxycolorselector.h b/kcoloredit/kxycolorselector.h index 276174ff..c785a293 100644 --- a/kcoloredit/kxycolorselector.h +++ b/kcoloredit/kxycolorselector.h @@ -27,7 +27,7 @@ * @author Artur Rataj */ class KXYColorSelector : public KXYSelector { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcoloredit/kzcolorselector.cpp b/kcoloredit/kzcolorselector.cpp index f753649e..6d4aa1cb 100644 --- a/kcoloredit/kzcolorselector.cpp +++ b/kcoloredit/kzcolorselector.cpp @@ -23,7 +23,7 @@ #include "main.h" #include "kzcolorselector.h" -KZColorSelector::KZColorSelector(Qt::Orientation o, TQWidget *parent, const char *name) : +KZColorSelector::KZColorSelector(TQt::Orientation o, TQWidget *parent, const char *name) : TDESelector(o, parent, name) { baseColorH = -1; baseColorS = 0; diff --git a/kcoloredit/kzcolorselector.h b/kcoloredit/kzcolorselector.h index cae9d1c5..23f1f1d4 100644 --- a/kcoloredit/kzcolorselector.h +++ b/kcoloredit/kzcolorselector.h @@ -28,7 +28,7 @@ * @author Artur Rataj */ class KZColorSelector : public TDESelector { - Q_OBJECT + TQ_OBJECT public: @@ -38,7 +38,7 @@ public: TYPE_V = 2 }; /** Constructs the widget */ - KZColorSelector(Qt::Orientation o, TQWidget *parent=0, const char *name=0); + KZColorSelector(TQt::Orientation o, TQWidget *parent=0, const char *name=0); ~KZColorSelector(); /** Sets the selector type */ void setType(const int type); diff --git a/kcoloredit/loadpalettedlg.cpp b/kcoloredit/loadpalettedlg.cpp index 057dbe7c..aa95c007 100644 --- a/kcoloredit/loadpalettedlg.cpp +++ b/kcoloredit/loadpalettedlg.cpp @@ -65,12 +65,12 @@ LoadPaletteDlg::LoadPaletteDlg(TQWidget *parent, const char *name) else paletteBox->insertItem(paletteName); } - connect(paletteBox, TQT_SIGNAL( activated(int) ), TQT_SLOT( setFileName(int) )); + connect(paletteBox, TQ_SIGNAL( activated(int) ), TQ_SLOT( setFileName(int) )); topLayout->addWidget(paletteBox); TQHBoxLayout* browseLayout = new TQHBoxLayout( mainWidget ); TQPushButton* browseButton = new TQPushButton(i18n( "Browse..." ), mainWidget); - connect(browseButton, TQT_SIGNAL( clicked() ), TQT_SLOT( browseFileNames() )); + connect(browseButton, TQ_SIGNAL( clicked() ), TQ_SLOT( browseFileNames() )); browseLayout->addWidget(browseButton); browseLayout->addStretch(10); topLayout->addLayout(browseLayout); diff --git a/kcoloredit/loadpalettedlg.h b/kcoloredit/loadpalettedlg.h index acb8712c..6f752ee5 100644 --- a/kcoloredit/loadpalettedlg.h +++ b/kcoloredit/loadpalettedlg.h @@ -26,7 +26,7 @@ *@author Artur Rataj */ class LoadPaletteDlg : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcoloredit/paletteview.cpp b/kcoloredit/paletteview.cpp index 52e8b4be..ed8ff1ac 100644 --- a/kcoloredit/paletteview.cpp +++ b/kcoloredit/paletteview.cpp @@ -32,14 +32,14 @@ PaletteView::PaletteView(const int defaultCellWidth, const int defaultCellHeight topLayout->setColStretch(0, 10); topLayout->setColStretch(1, 0); scrollBar = new TQScrollBar(this); - hScrollBar = new TQScrollBar(0, 1, 1, 1, 0, Qt::Horizontal, this); + hScrollBar = new TQScrollBar(0, 1, 1, 1, 0, TQt::Horizontal, this); scrolledArea = new PaletteViewScrolledArea(defaultCellWidth, defaultCellHeight, cellSpacing, scrollBar, hScrollBar, view, this); - connect(scrollBar, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotRepaintScrolledArea() )); + connect(scrollBar, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotRepaintScrolledArea() )); topLayout->addWidget(scrolledArea, 0, 0); - connect(hScrollBar, TQT_SIGNAL( valueChanged(int) ), - TQT_SLOT( slotRepaintScrolledArea() )); + connect(hScrollBar, TQ_SIGNAL( valueChanged(int) ), + TQ_SLOT( slotRepaintScrolledArea() )); TQHBoxLayout* hScrollBarLayout = new TQHBoxLayout(); hScrollBarLayout->addWidget(hScrollBar, 10); hScrollBarLayout->addWidget(new TQWidget(this), 0); diff --git a/kcoloredit/paletteview.h b/kcoloredit/paletteview.h index 2b0f4a5e..e01cce37 100644 --- a/kcoloredit/paletteview.h +++ b/kcoloredit/paletteview.h @@ -30,7 +30,7 @@ class KColorEditView; * @author Artur Rataj */ class PaletteView : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcoloredit/paletteviewscrolledarea.cpp b/kcoloredit/paletteviewscrolledarea.cpp index 3a70aacc..a00606c8 100644 --- a/kcoloredit/paletteviewscrolledarea.cpp +++ b/kcoloredit/paletteviewscrolledarea.cpp @@ -48,7 +48,7 @@ PaletteViewScrolledArea::PaletteViewScrolledArea(const int defaultCellWidth, this->view = view; setBackgroundMode(NoBackground); scrollTimeoutTimer = new TQTimer(this); - connect(scrollTimeoutTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotScrollTimeout() )); + connect(scrollTimeoutTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotScrollTimeout() )); scrollTimeout = true; mousePressed = false; cursorPositioning = false; @@ -220,7 +220,7 @@ void PaletteViewScrolledArea::paintEvent(TQPaintEvent* /*event*/) { setCellsSizes(); TQPixmap pixmap(size()); TQPainter painter; - painter.begin(TQT_TQPAINTDEVICE(&pixmap), this); + painter.begin(&pixmap, this); TQFontMetrics fontMetrics = painter.fontMetrics(); int maxLineWidth; if(viewColorNames) { diff --git a/kcoloredit/paletteviewscrolledarea.h b/kcoloredit/paletteviewscrolledarea.h index abf09fe5..8ee0cd9a 100644 --- a/kcoloredit/paletteviewscrolledarea.h +++ b/kcoloredit/paletteviewscrolledarea.h @@ -32,7 +32,7 @@ class TQScrollBar; * @author Artur Rataj */ class PaletteViewScrolledArea : public TQFrame { - Q_OBJECT + TQ_OBJECT public: diff --git a/kcoloredit/texteditselection.cpp b/kcoloredit/texteditselection.cpp index f1da81a1..35ee28db 100644 --- a/kcoloredit/texteditselection.cpp +++ b/kcoloredit/texteditselection.cpp @@ -34,24 +34,24 @@ TextEditSelection::TextEditSelection(TQWidget *parent, const char *name ) : TQWi componentsLayout->setColStretch(4, 10); TQLineEdit* lineEdit; addComponent(H_INDEX, ( lineEdit = new TQLineEdit(this) ), HSV_MAX_H_VALUE, "H:", 0, 0, componentsLayout); - connect(lineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( slotHsvComponentChanged() )); + connect(lineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( slotHsvComponentChanged() )); addComponent(S_INDEX, ( lineEdit = new TQLineEdit(this) ), HSV_MAX_S_VALUE, "S:", 1, 0, componentsLayout); - connect(lineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( slotHsvComponentChanged() )); + connect(lineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( slotHsvComponentChanged() )); addComponent(V_INDEX, ( lineEdit = new TQLineEdit(this) ), HSV_MAX_V_VALUE, "V:", 2, 0, componentsLayout); - connect(lineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( slotHsvComponentChanged() )); + connect(lineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( slotHsvComponentChanged() )); addComponent(R_INDEX, ( lineEdit = new TQLineEdit(this) ), RGB_MAX_COMPONENT_VALUE, "R:", 0, 1, componentsLayout); - connect(lineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( slotRgbComponentChanged() )); + connect(lineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( slotRgbComponentChanged() )); addComponent(G_INDEX, ( lineEdit = new TQLineEdit(this) ), RGB_MAX_COMPONENT_VALUE, "G:", 1, 1, componentsLayout); - connect(lineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( slotRgbComponentChanged() )); + connect(lineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( slotRgbComponentChanged() )); addComponent(B_INDEX, ( lineEdit = new TQLineEdit(this) ), RGB_MAX_COMPONENT_VALUE, "B:", 2, 1, componentsLayout); - connect(lineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( slotRgbComponentChanged() )); + connect(lineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( slotRgbComponentChanged() )); TQHBoxLayout* rgbStringLayout = new TQHBoxLayout(2); TQLabel* rgbStringLabel = new TQLabel("RGB " + i18n( "hex." ) + ": ", this); rgbStringLayout->addWidget(rgbStringLabel); rgbStringLineEdit = new TQLineEdit(this); rgbStringLineEdit->setMinimumWidth(lineEdit->fontMetrics().width( TQString("8888888") )); rgbStringLineEdit->setMaximumWidth(lineEdit->fontMetrics().width( TQString("888888888") )); - connect(rgbStringLineEdit, TQT_SIGNAL( textChanged(const TQString&) ), TQT_SLOT( slotRgbStringChanged() )); + connect(rgbStringLineEdit, TQ_SIGNAL( textChanged(const TQString&) ), TQ_SLOT( slotRgbStringChanged() )); rgbStringLayout->addWidget(rgbStringLineEdit); topLayout->addLayout(rgbStringLayout); } @@ -61,7 +61,7 @@ TextEditSelection::~TextEditSelection(){ void TextEditSelection::addComponent(const int index, TQLineEdit* lineEdit, const int maxValue, const TQString& labelString, const int row, const int column, TQGridLayout* layout) { TQLabel* label = new TQLabel(labelString, this); - lineEdit->setValidator(new TQIntValidator( 0, maxValue, TQT_TQOBJECT(lineEdit) )); + lineEdit->setValidator(new TQIntValidator( 0, maxValue, lineEdit )); lineEditTable[index] = lineEdit; lineEdit->setMinimumWidth(lineEdit->fontMetrics().width( TQString("8888") )); lineEdit->setMaximumWidth(lineEdit->fontMetrics().width( TQString("8888888") )); diff --git a/kcoloredit/texteditselection.h b/kcoloredit/texteditselection.h index 278463a2..fcee626a 100644 --- a/kcoloredit/texteditselection.h +++ b/kcoloredit/texteditselection.h @@ -29,7 +29,7 @@ * @author Artur Rataj */ class TextEditSelection : public TQWidget { - Q_OBJECT + TQ_OBJECT public: |