summaryrefslogtreecommitdiffstats
path: root/tdeiconedit
diff options
context:
space:
mode:
Diffstat (limited to 'tdeiconedit')
-rw-r--r--tdeiconedit/knew.cpp10
-rw-r--r--tdeiconedit/palettetoolbar.cpp12
-rw-r--r--tdeiconedit/tdeiconconfig.cpp42
-rw-r--r--tdeiconedit/tdeiconedit.cpp168
-rw-r--r--tdeiconedit/tdeicongrid.cpp16
5 files changed, 124 insertions, 124 deletions
diff --git a/tdeiconedit/knew.cpp b/tdeiconedit/knew.cpp
index 2536816f..5bbc4ed0 100644
--- a/tdeiconedit/knew.cpp
+++ b/tdeiconedit/knew.cpp
@@ -157,7 +157,7 @@ NewSelect::NewSelect(TQWidget *parent) : TQWidget( parent )
{
wiz = (KWizard*) parent;
grp = new TQButtonGroup( this );
- connect( grp, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( buttonClicked( int ) ) );
+ connect( grp, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( buttonClicked( int ) ) );
grp->setExclusive( true );
TQVBoxLayout* ml = new TQVBoxLayout( this );
@@ -203,7 +203,7 @@ NewFromTemplate::NewFromTemplate( TQWidget* parent )
TQHBoxLayout* l = new TQHBoxLayout( grp, 15 );
templates = new TDEIconListBox( grp );
- connect( templates, TQT_SIGNAL( highlighted( int ) ), TQT_SLOT( checkSelection( int ) ) );
+ connect( templates, TQ_SIGNAL( highlighted( int ) ), TQ_SLOT( checkSelection( int ) ) );
l->addWidget( templates );
for( int i = 0; i < (int) TDEIconTemplateContainer::self()->count(); i++ )
@@ -237,14 +237,14 @@ KNewIcon::KNewIcon( TQWidget* parent )
nextButton()->setEnabled( false );
select = new NewSelect( this );
- connect( select, TQT_SIGNAL( iconopenstyle( int ) ), TQT_SLOT( iconOpenStyle( int ) ) );
+ connect( select, TQ_SIGNAL( iconopenstyle( int ) ), TQ_SLOT( iconOpenStyle( int ) ) );
scratch = new KResizeWidget( this, 0, TQSize( 32, 32 ) );
// this doesn't accept default valid size, besides spin buttons won't allow
// an invalid size to be set by the user - forces user to change valid default
// size to create the new icon object -
- connect( scratch, TQT_SIGNAL( validSize( bool ) ), TQT_SLOT( checkPage( bool ) ) );
- connect(this, TQT_SIGNAL(selected(const TQString &)), this, TQT_SLOT(checkPage(const TQString &)));
+ connect( scratch, TQ_SIGNAL( validSize( bool ) ), TQ_SLOT( checkPage( bool ) ) );
+ connect(this, TQ_SIGNAL(selected(const TQString &)), this, TQ_SLOT(checkPage(const TQString &)));
templ = new NewFromTemplate(this);
templ->hide();
diff --git a/tdeiconedit/palettetoolbar.cpp b/tdeiconedit/palettetoolbar.cpp
index 407821cc..879acdb7 100644
--- a/tdeiconedit/palettetoolbar.cpp
+++ b/tdeiconedit/palettetoolbar.cpp
@@ -63,8 +63,8 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name )
vlayout->addWidget( m_sysColors );
- connect( m_sysColors, TQT_SIGNAL( newColor(uint) ),
- TQT_SIGNAL( newColor(uint) ) );
+ connect( m_sysColors, TQ_SIGNAL( newColor(uint) ),
+ TQ_SIGNAL( newColor(uint) ) );
vlayout = new TQVBoxLayout( m_layout, 0 );
l = new TQLabel( i18n( "Custom colors:" ), base );
@@ -76,10 +76,10 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name )
vlayout->addWidget( m_customColors );
- connect( m_customColors, TQT_SIGNAL( newColor(uint) ),
- TQT_SIGNAL( newColor(uint) ) );
- connect( this, TQT_SIGNAL( newColor(uint)),
- this, TQT_SLOT(currentColorChanged(uint)));
+ connect( m_customColors, TQ_SIGNAL( newColor(uint) ),
+ TQ_SIGNAL( newColor(uint) ) );
+ connect( this, TQ_SIGNAL( newColor(uint)),
+ this, TQ_SLOT(currentColorChanged(uint)));
currentColorChanged(OPAQUE_MASK|0);
setEnableContextMenu( false );
diff --git a/tdeiconedit/tdeiconconfig.cpp b/tdeiconedit/tdeiconconfig.cpp
index 464497f3..3763f4db 100644
--- a/tdeiconedit/tdeiconconfig.cpp
+++ b/tdeiconedit/tdeiconconfig.cpp
@@ -65,13 +65,13 @@ KTemplateEditDlg::KTemplateEditDlg(TQWidget *parent)
TQGridLayout *l = new TQGridLayout(grp->layout());
ln_name = new TQLineEdit( grp );
- connect( ln_name, TQT_SIGNAL( textChanged( const TQString & ) ),
- TQT_SLOT( slotTextChanged() ) );
+ connect( ln_name, TQ_SIGNAL( textChanged( const TQString & ) ),
+ TQ_SLOT( slotTextChanged() ) );
TQLabel* lb_name = new TQLabel( ln_name, i18n( "Description:" ), grp );
ln_path = new KURLRequester(grp);
- connect( ln_path, TQT_SIGNAL( textChanged( const TQString & ) ),
- TQT_SLOT( slotTextChanged() ) );
+ connect( ln_path, TQ_SIGNAL( textChanged( const TQString & ) ),
+ TQ_SLOT( slotTextChanged() ) );
TQLabel* lb_path = new TQLabel( ln_path, i18n( "Path:" ), grp );
l->addWidget(lb_name, 0, 0);
@@ -122,10 +122,10 @@ KTemplateConfig::KTemplateConfig(TQWidget *parent) : TQWidget(parent)
grp->setColumnLayout( 0, TQt::Horizontal );
templates = new TDEIconListBox( grp );
- connect( templates, TQT_SIGNAL( highlighted( int ) ),
- TQT_SLOT( checkSelection( int ) ) );
- connect( templates, TQT_SIGNAL(doubleClicked( TQListBoxItem * ) ),
- TQT_SLOT( edit() ) );
+ connect( templates, TQ_SIGNAL( highlighted( int ) ),
+ TQ_SLOT( checkSelection( int ) ) );
+ connect( templates, TQ_SIGNAL(doubleClicked( TQListBoxItem * ) ),
+ TQ_SLOT( edit() ) );
TQVBoxLayout* ml = new TQVBoxLayout( this );
ml->addWidget( grp );
@@ -139,14 +139,14 @@ KTemplateConfig::KTemplateConfig(TQWidget *parent) : TQWidget(parent)
KButtonBox *bbox = new KButtonBox( grp );
btadd = bbox->addButton( i18n( "&Add..." ) );
- connect( btadd, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) );
+ connect( btadd, TQ_SIGNAL( clicked() ), TQ_SLOT( add() ) );
btedit = bbox->addButton( i18n( "&Edit..." ) );
- connect( btedit, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) );
+ connect( btedit, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) );
btedit->setEnabled( false );
btremove = bbox->addButton( i18n( "&Remove" ) );
- connect( btremove, TQT_SIGNAL( clicked() ), TQT_SLOT( remove() ) );
+ connect( btremove, TQ_SIGNAL( clicked() ), TQ_SLOT( remove() ) );
btremove->setEnabled( false );
bbox->addStretch( 1 );
@@ -255,7 +255,7 @@ KBackgroundConfig::KBackgroundConfig( TQWidget* parent )
TQButtonGroup* btngrp = new TQButtonGroup( grp1 );
btngrp->setExclusive( true );
btngrp->setFrameStyle( TQFrame::NoFrame );
- connect( btngrp, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotBackgroundMode( int ) ) );
+ connect( btngrp, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotBackgroundMode( int ) ) );
grp1Layout->addWidget( btngrp, 0, 0 );
TQVBoxLayout *bgl = new TQVBoxLayout( btngrp, 5 );
@@ -274,11 +274,11 @@ KBackgroundConfig::KBackgroundConfig( TQWidget* parent )
grp1Layout->addWidget( bbox, 0, 1 );
btcolor = new KColorButton(props->bgColor(), bbox) ;
- connect(btcolor, TQT_SIGNAL(changed(const TQColor &)),
- TQT_SLOT( selectColor(const TQColor &)));
+ connect(btcolor, TQ_SIGNAL(changed(const TQColor &)),
+ TQ_SLOT( selectColor(const TQColor &)));
btpix = new TQPushButton(i18n( "Choose..." ), bbox);
- connect( btpix, TQT_SIGNAL( clicked() ), TQT_SLOT( selectPixmap() ) );
+ connect( btpix, TQ_SIGNAL( clicked() ), TQ_SLOT( selectPixmap() ) );
TQGroupBox *grp2 = new TQGroupBox( i18n( "Preview" ), this );
mainLayout->addWidget( grp2, 1 );
@@ -382,16 +382,16 @@ KMiscConfig::KMiscConfig(TQWidget *parent) : TQWidget(parent)
TQBoxLayout *ml = new TQVBoxLayout( this, 0, 5 );
TQCheckBox *cbp = new TQCheckBox( i18n( "Paste &transparent pixels" ), this );
- connect( cbp, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( pasteMode( bool ) ) );
+ connect( cbp, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( pasteMode( bool ) ) );
ml->addWidget(cbp);
TQCheckBox *cbr = new TQCheckBox( i18n( "Show &rulers" ), this );
- connect( cbr, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( showRulers( bool ) ) );
+ connect( cbr, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( showRulers( bool ) ) );
ml->addWidget(cbr);
TQButtonGroup* btngrp = new TQButtonGroup( i18n( "Transparency Display" ), this);
btngrp->setExclusive( true );
- connect( btngrp, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( slotTransparencyDisplayType( int ) ) );
+ connect( btngrp, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( slotTransparencyDisplayType( int ) ) );
ml->addWidget( btngrp );
TQVBoxLayout *tgl = new TQVBoxLayout( btngrp, KDialog::marginHint(), KDialog::spacingHint() );
@@ -406,8 +406,8 @@ KMiscConfig::KMiscConfig(TQWidget *parent) : TQWidget(parent)
m_solidColorButton = new KColorButton(props->transparencySolidColor(), btngrp);
btngrp->insert( m_solidColorButton, 2 );
hl->addWidget(m_solidColorButton);
- //connect(btcolor, TQT_SIGNAL(changed(const TQColor &)),
- // TQT_SLOT( selectColor(const TQColor &)));
+ //connect(btcolor, TQ_SIGNAL(changed(const TQColor &)),
+ // TQ_SLOT( selectColor(const TQColor &)));
TQRadioButton *checkerboardRButton = new TQRadioButton( i18n( "Checker&board" ), btngrp );
btngrp->insert( checkerboardRButton, 1 );
@@ -535,7 +535,7 @@ TDEIconConfig::TDEIconConfig(TQWidget *parent)
{
setHelp(TQString());
//KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
- connect(this, TQT_SIGNAL(finished()), this, TQT_SLOT(finis()));
+ connect(this, TQ_SIGNAL(finished()), this, TQ_SLOT(finis()));
TQVBox* page = addVBoxPage(i18n("Icon Templates"), TQString(), loadIcon("icons"));
temps = new KTemplateConfig(page);
diff --git a/tdeiconedit/tdeiconedit.cpp b/tdeiconedit/tdeiconedit.cpp
index 61a80ec7..b72320ac 100644
--- a/tdeiconedit/tdeiconedit.cpp
+++ b/tdeiconedit/tdeiconedit.cpp
@@ -74,53 +74,53 @@ void TDEIconEdit::init()
createGUI();
- connect(this, TQT_SIGNAL(newname(const TQString &)),
- TQT_SLOT( slotUpdateStatusName(const TQString &)));
-
- connect( icon, TQT_SIGNAL( saved()), TQT_SLOT(slotSaved()));
- connect( icon, TQT_SIGNAL( loaded(TQImage *)), grid, TQT_SLOT(load(TQImage *)));
- connect( icon, TQT_SIGNAL(opennewwin(const TQString &)),
- TQT_SLOT(slotNewWin(const TQString &)));
- connect(icon, TQT_SIGNAL(newname(const TQString &)),
- TQT_SLOT( slotUpdateStatusName(const TQString &)));
- connect(icon, TQT_SIGNAL(newmessage(const TQString &)),
- TQT_SLOT( slotUpdateStatusMessage(const TQString &)));
- connect(icon, TQT_SIGNAL(addrecent(const TQString &)),
- TQT_SLOT( addRecent(const TQString &)));
-
- connect( m_paletteToolBar, TQT_SIGNAL( newColor(uint)),
- grid, TQT_SLOT(setColorSelection(uint)));
-
- connect( grid, TQT_SIGNAL( changed(const TQPixmap &) ),
- m_paletteToolBar, TQT_SLOT( previewChanged(const TQPixmap &) ) );
- connect( grid, TQT_SIGNAL( addingcolor(uint) ),
- m_paletteToolBar, TQT_SLOT(addColor(uint)));
- connect( grid, TQT_SIGNAL( colorschanged(uint, uint*) ),
- m_paletteToolBar, TQT_SLOT(addColors(uint, uint*)));
-
- connect(grid, TQT_SIGNAL(sizechanged(int, int)),
- TQT_SLOT( slotUpdateStatusSize(int, int)));
- connect(grid, TQT_SIGNAL(poschanged(int, int)),
- TQT_SLOT( slotUpdateStatusPos(int, int)));
- connect(grid, TQT_SIGNAL(scalingchanged(int)),
- TQT_SLOT( slotUpdateStatusScaling(int)));
- connect(grid, TQT_SIGNAL(scalingchanged(int)),
- TQT_SLOT( slotUpdateZoom(int)));
- connect( grid, TQT_SIGNAL( addingcolor(uint) ),
- TQT_SLOT(slotUpdateStatusColors(uint)));
- connect(grid, TQT_SIGNAL(colorschanged(uint, uint*)),
- TQT_SLOT( slotUpdateStatusColors(uint, uint*)));
- connect(grid, TQT_SIGNAL(newmessage(const TQString &)),
- TQT_SLOT( slotUpdateStatusMessage(const TQString &)));
- connect(grid, TQT_SIGNAL(clipboarddata(bool)),
- TQT_SLOT( slotUpdatePaste(bool)));
- connect(grid, TQT_SIGNAL(colorSelected(uint)),
- m_paletteToolBar, TQT_SLOT(currentColorChanged(uint)));
- connect(grid, TQT_SIGNAL(modifiedchanged(bool)),
- TQT_SLOT( slotUpdateStatusModified(bool)));
+ connect(this, TQ_SIGNAL(newname(const TQString &)),
+ TQ_SLOT( slotUpdateStatusName(const TQString &)));
+
+ connect( icon, TQ_SIGNAL( saved()), TQ_SLOT(slotSaved()));
+ connect( icon, TQ_SIGNAL( loaded(TQImage *)), grid, TQ_SLOT(load(TQImage *)));
+ connect( icon, TQ_SIGNAL(opennewwin(const TQString &)),
+ TQ_SLOT(slotNewWin(const TQString &)));
+ connect(icon, TQ_SIGNAL(newname(const TQString &)),
+ TQ_SLOT( slotUpdateStatusName(const TQString &)));
+ connect(icon, TQ_SIGNAL(newmessage(const TQString &)),
+ TQ_SLOT( slotUpdateStatusMessage(const TQString &)));
+ connect(icon, TQ_SIGNAL(addrecent(const TQString &)),
+ TQ_SLOT( addRecent(const TQString &)));
+
+ connect( m_paletteToolBar, TQ_SIGNAL( newColor(uint)),
+ grid, TQ_SLOT(setColorSelection(uint)));
+
+ connect( grid, TQ_SIGNAL( changed(const TQPixmap &) ),
+ m_paletteToolBar, TQ_SLOT( previewChanged(const TQPixmap &) ) );
+ connect( grid, TQ_SIGNAL( addingcolor(uint) ),
+ m_paletteToolBar, TQ_SLOT(addColor(uint)));
+ connect( grid, TQ_SIGNAL( colorschanged(uint, uint*) ),
+ m_paletteToolBar, TQ_SLOT(addColors(uint, uint*)));
+
+ connect(grid, TQ_SIGNAL(sizechanged(int, int)),
+ TQ_SLOT( slotUpdateStatusSize(int, int)));
+ connect(grid, TQ_SIGNAL(poschanged(int, int)),
+ TQ_SLOT( slotUpdateStatusPos(int, int)));
+ connect(grid, TQ_SIGNAL(scalingchanged(int)),
+ TQ_SLOT( slotUpdateStatusScaling(int)));
+ connect(grid, TQ_SIGNAL(scalingchanged(int)),
+ TQ_SLOT( slotUpdateZoom(int)));
+ connect( grid, TQ_SIGNAL( addingcolor(uint) ),
+ TQ_SLOT(slotUpdateStatusColors(uint)));
+ connect(grid, TQ_SIGNAL(colorschanged(uint, uint*)),
+ TQ_SLOT( slotUpdateStatusColors(uint, uint*)));
+ connect(grid, TQ_SIGNAL(newmessage(const TQString &)),
+ TQ_SLOT( slotUpdateStatusMessage(const TQString &)));
+ connect(grid, TQ_SIGNAL(clipboarddata(bool)),
+ TQ_SLOT( slotUpdatePaste(bool)));
+ connect(grid, TQ_SIGNAL(colorSelected(uint)),
+ m_paletteToolBar, TQ_SLOT(currentColorChanged(uint)));
+ connect(grid, TQ_SIGNAL(modifiedchanged(bool)),
+ TQ_SLOT( slotUpdateStatusModified(bool)));
gridview->checkClipboard(); //Not very elegant, but fixes a buglet
- connect(grid, TQT_SIGNAL(selecteddata(bool)), TQT_SLOT( slotUpdateCopy(bool)));
+ connect(grid, TQ_SIGNAL(selecteddata(bool)), TQ_SLOT( slotUpdateCopy(bool)));
kdDebug(4640) << "Updating statusbar" << endl;
slotUpdateStatusSize(grid->cols(), grid->rows());
@@ -240,43 +240,43 @@ void TDEIconEdit::setupActions()
// File Menu
action = new TDEAction(i18n("New &Window"), "window-new", cut,
- this, TQT_SLOT(slotNewWin()), actionCollection(), "file_new_window");
+ this, TQ_SLOT(slotNewWin()), actionCollection(), "file_new_window");
action->setWhatsThis(i18n("New window\n\nOpens a new icon editor window."));
- action = KStdAction::openNew(this, TQT_SLOT(slotNew()), actionCollection());
+ action = KStdAction::openNew(this, TQ_SLOT(slotNew()), actionCollection());
action->setWhatsThis(i18n("New\n\nCreate a new icon, either from a"
" template or by specifying the size"));
- action = KStdAction::open(this, TQT_SLOT(slotOpen()), actionCollection());
+ action = KStdAction::open(this, TQ_SLOT(slotOpen()), actionCollection());
action->setWhatsThis(i18n("Open\n\nOpen an existing icon"));
m_actRecent = KStdAction::openRecent(this,
- TQT_SLOT(slotOpenRecent(const KURL&)), actionCollection());
+ TQ_SLOT(slotOpenRecent(const KURL&)), actionCollection());
m_actRecent->setMaxItems(15); // FIXME should be configurable!
m_actRecent->loadEntries(kapp->config());
- action = KStdAction::save(this, TQT_SLOT(slotSave()), actionCollection());
+ action = KStdAction::save(this, TQ_SLOT(slotSave()), actionCollection());
action->setWhatsThis(i18n("Save\n\nSave the current icon"));
- KStdAction::saveAs(this, TQT_SLOT(slotSaveAs()), actionCollection());
+ KStdAction::saveAs(this, TQ_SLOT(slotSaveAs()), actionCollection());
- action = KStdAction::print(this, TQT_SLOT(slotPrint()), actionCollection());
+ action = KStdAction::print(this, TQ_SLOT(slotPrint()), actionCollection());
action->setWhatsThis(i18n("Print\n\nOpens a print dialog to let you print"
" the current icon."));
- KStdAction::close(this, TQT_SLOT(slotClose()), actionCollection());
+ KStdAction::close(this, TQ_SLOT(slotClose()), actionCollection());
// Edit Menu
- m_actCut = KStdAction::cut(this, TQT_SLOT(slotCut()), actionCollection());
+ m_actCut = KStdAction::cut(this, TQ_SLOT(slotCut()), actionCollection());
m_actCut->setWhatsThis(i18n("Cut\n\nCut the current selection out of the"
" icon.\n\n(Tip: You can make both rectangular and circular selections)"));
- m_actCopy = KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection());
+ m_actCopy = KStdAction::copy(this, TQ_SLOT(slotCopy()), actionCollection());
m_actCopy->setWhatsThis(i18n("Copy\n\nCopy the current selection out of the"
" icon.\n\n(Tip: You can make both rectangular and circular selections)"));
- m_actPaste = KStdAction::paste(this, TQT_SLOT(slotPaste()), actionCollection());
+ m_actPaste = KStdAction::paste(this, TQ_SLOT(slotPaste()), actionCollection());
m_actPaste->setWhatsThis(i18n("Paste\n\n"
"Paste the contents of the clipboard into the current icon.\n\n"
"If the contents are larger than the current icon you can paste them"
@@ -285,28 +285,28 @@ void TDEIconEdit::setupActions()
" if you also want to paste transparency.)"));
m_actPasteNew = new TDEAction( i18n( "Paste as &New" ), cut, grid,
- TQT_SLOT( editPasteAsNew() ), actionCollection(), "edit_paste_as_new" );
+ TQ_SLOT( editPasteAsNew() ), actionCollection(), "edit_paste_as_new" );
- KStdAction::clear(this, TQT_SLOT(slotClear()), actionCollection());
- KStdAction::selectAll(this, TQT_SLOT(slotSelectAll()), actionCollection());
+ KStdAction::clear(this, TQ_SLOT(slotClear()), actionCollection());
+ KStdAction::selectAll(this, TQ_SLOT(slotSelectAll()), actionCollection());
action = new TDEAction(i18n("Resi&ze..."), "transform", cut,
- grid, TQT_SLOT(editResize()), actionCollection(), "edit_resize");
+ grid, TQ_SLOT(editResize()), actionCollection(), "edit_resize");
action->setWhatsThis(i18n("Resize\n\nSmoothly resizes the icon while"
" trying to preserve the contents"));
action = new TDEAction(i18n("&GrayScale"), "grayscale", cut,
- grid, TQT_SLOT(grayScale()), actionCollection(), "edit_grayscale");
+ grid, TQ_SLOT(grayScale()), actionCollection(), "edit_grayscale");
action->setWhatsThis(i18n("Gray scale\n\nGray scale the current icon.\n"
"(Warning: The result is likely to contain colors not in the icon"
" palette"));
// View Menu
- m_actZoomIn = KStdAction::zoomIn(this, TQT_SLOT(slotZoomIn()),
+ m_actZoomIn = KStdAction::zoomIn(this, TQ_SLOT(slotZoomIn()),
actionCollection());
m_actZoomIn->setWhatsThis(i18n("Zoom in\n\nZoom in by one."));
- m_actZoomOut = KStdAction::zoomOut(this, TQT_SLOT(slotZoomOut()),
+ m_actZoomOut = KStdAction::zoomOut(this, TQ_SLOT(slotZoomOut()),
actionCollection());
m_actZoomOut->setWhatsThis(i18n("Zoom out\n\nZoom out by one."));
@@ -314,26 +314,26 @@ void TDEIconEdit::setupActions()
actionCollection(), "view_zoom" );
// xgettext:no-c-format
- action = new TDEAction( i18n( "100%" ), cut, this, TQT_SLOT( slotZoom1() ),
+ action = new TDEAction( i18n( "100%" ), cut, this, TQ_SLOT( slotZoom1() ),
actionCollection(), "view_zoom_1" );
actMenu->insert( action );
// xgettext:no-c-format
- action = new TDEAction( i18n( "200%" ), cut, this, TQT_SLOT( slotZoom2() ),
+ action = new TDEAction( i18n( "200%" ), cut, this, TQ_SLOT( slotZoom2() ),
actionCollection(), "view_zoom_2" );
actMenu->insert( action );
// xgettext:no-c-format
- action = new TDEAction( i18n( "500%" ), cut, this, TQT_SLOT( slotZoom5() ),
+ action = new TDEAction( i18n( "500%" ), cut, this, TQ_SLOT( slotZoom5() ),
actionCollection(), "view_zoom_5" );
actMenu->insert( action );
// xgettext:no-c-format
- action = new TDEAction( i18n( "1000%" ), cut, this, TQT_SLOT( slotZoom10() ),
+ action = new TDEAction( i18n( "1000%" ), cut, this, TQ_SLOT( slotZoom10() ),
actionCollection(), "view_zoom_10" );
actMenu->insert( action );
// Settings Menu
- KStdAction::keyBindings(this, TQT_SLOT(slotConfigureKeys()),
+ KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()),
actionCollection());
- KStdAction::preferences(this, TQT_SLOT(slotConfigureSettings()),
+ KStdAction::preferences(this, TQ_SLOT(slotConfigureSettings()),
actionCollection());
createStandardStatusBarAction();
@@ -341,7 +341,7 @@ void TDEIconEdit::setupActions()
TDEToggleAction *toggle;
toggle = new TDEToggleAction( i18n( "Show &Grid" ), "grid",
- cut, this, TQT_SLOT( slotShowGrid() ), actionCollection(),
+ cut, this, TQ_SLOT( slotShowGrid() ), actionCollection(),
"options_show_grid" );
toggle->setCheckedState(i18n("Hide &Grid"));
toggle->setWhatsThis( i18n( "Show grid\n\nToggles the grid in the icon"
@@ -350,14 +350,14 @@ void TDEIconEdit::setupActions()
// Tools Menu
toolAction = new TDERadioAction(i18n("Color Picker"), "colorpicker",
- cut, this, TQT_SLOT(slotToolPointer()), actionCollection(),
+ cut, this, TQ_SLOT(slotToolPointer()), actionCollection(),
"tool_find_pixel");
toolAction->setExclusiveGroup("toolActions");
toolAction->setWhatsThis(i18n("Color Picker\n\nThe color of the pixel clicked"
" on will be the current draw color"));
toolAction = new TDERadioAction(i18n("Freehand"), "paintbrush",
- cut, this, TQT_SLOT(slotToolFreehand()), actionCollection(),
+ cut, this, TQ_SLOT(slotToolFreehand()), actionCollection(),
"tool_freehand");
toolAction->setExclusiveGroup("toolActions");
toolAction->setWhatsThis(i18n("Free hand\n\nDraw non-linear lines"));
@@ -366,64 +366,64 @@ void TDEIconEdit::setupActions()
grid->setTool(TDEIconEditGrid::Freehand);
toolAction = new TDERadioAction(i18n("Rectangle"), "rectangle",
- cut, this, TQT_SLOT(slotToolRectangle()), actionCollection(),
+ cut, this, TQ_SLOT(slotToolRectangle()), actionCollection(),
"tool_rectangle");
toolAction->setExclusiveGroup("toolActions");
toolAction->setWhatsThis(i18n("Rectangle\n\nDraw a rectangle"));
toolAction = new TDERadioAction(i18n("Filled Rectangle"), "filledrectangle",
- cut, this, TQT_SLOT(slotToolFilledRectangle()), actionCollection(),
+ cut, this, TQ_SLOT(slotToolFilledRectangle()), actionCollection(),
"tool_filled_rectangle");
toolAction->setExclusiveGroup("toolActions");
toolAction->setWhatsThis(i18n("Filled rectangle\n\nDraw a filled rectangle"));
toolAction = new TDERadioAction(i18n("Circle"), "circle",
- cut, this, TQT_SLOT(slotToolCircle()), actionCollection(),
+ cut, this, TQ_SLOT(slotToolCircle()), actionCollection(),
"tool_circle");
toolAction->setExclusiveGroup("toolActions");
toolAction->setWhatsThis(i18n("Circle\n\nDraw a circle"));
toolAction = new TDERadioAction(i18n("Filled Circle"), "filledcircle",
- cut, this, TQT_SLOT(slotToolFilledCircle()), actionCollection(),
+ cut, this, TQ_SLOT(slotToolFilledCircle()), actionCollection(),
"tool_filled_circle");
toolAction->setExclusiveGroup("toolActions");
toolAction->setWhatsThis(i18n("Filled circle\n\nDraw a filled circle"));
toolAction = new TDERadioAction(i18n("Ellipse"), "ellipse",
- cut, this, TQT_SLOT(slotToolEllipse()), actionCollection(),
+ cut, this, TQ_SLOT(slotToolEllipse()), actionCollection(),
"tool_ellipse");
toolAction->setExclusiveGroup("toolActions");
toolAction->setWhatsThis(i18n("Ellipse\n\nDraw an ellipse"));
toolAction = new TDERadioAction(i18n("Filled Ellipse"), "filledellipse",
- cut, this, TQT_SLOT(slotToolFilledEllipse()), actionCollection(),
+ cut, this, TQ_SLOT(slotToolFilledEllipse()), actionCollection(),
"tool_filled_ellipse");
toolAction->setExclusiveGroup("toolActions");
toolAction->setWhatsThis(i18n("Filled ellipse\n\nDraw a filled ellipse"));
toolAction = new TDERadioAction(i18n("Spray"), "airbrush",
- cut, this, TQT_SLOT(slotToolSpray()), actionCollection(),
+ cut, this, TQ_SLOT(slotToolSpray()), actionCollection(),
"tool_spray");
toolAction->setExclusiveGroup("toolActions");
toolAction->setWhatsThis(i18n("Spray\n\nDraw scattered pixels in the"
" current color"));
toolAction = new TDERadioAction(i18n("Flood Fill"), "fill",
- cut, this, TQT_SLOT(slotToolFlood()), actionCollection(),
+ cut, this, TQ_SLOT(slotToolFlood()), actionCollection(),
"tool_flood_fill");
toolAction->setExclusiveGroup("toolActions");
toolAction->setWhatsThis(i18n("Flood fill\n\nFill adjoining pixels with"
" the same color with the current color"));
toolAction = new TDERadioAction(i18n("Line"), "line",
- cut, this, TQT_SLOT(slotToolLine()), actionCollection(),
+ cut, this, TQ_SLOT(slotToolLine()), actionCollection(),
"tool_line");
toolAction->setExclusiveGroup("toolActions");
toolAction->setWhatsThis(i18n("Line\n\nDraw a straight line vertically,"
" horizontally or at 45 deg. angles"));
toolAction = new TDERadioAction(i18n("Eraser (Transparent)"), "eraser",
- cut, this, TQT_SLOT(slotToolEraser()), actionCollection(),
+ cut, this, TQ_SLOT(slotToolEraser()), actionCollection(),
"tool_eraser");
toolAction->setExclusiveGroup("toolActions");
toolAction->setWhatsThis(i18n("Erase\n\nErase pixels. Set the pixels to"
@@ -432,14 +432,14 @@ void TDEIconEdit::setupActions()
" to use)"));
toolAction = new TDERadioAction(i18n("Rectangular Selection"),
- "selectrect", cut, this, TQT_SLOT(slotToolSelectRect()),
+ "selectrect", cut, this, TQ_SLOT(slotToolSelectRect()),
actionCollection(), "edit_select_rectangle");
toolAction->setExclusiveGroup( "toolActions" );
toolAction->setWhatsThis(i18n("Select\n\nSelect a rectangular section"
" of the icon using the mouse."));
toolAction = new TDERadioAction(i18n("Circular Selection"),
- "selectcircle", cut, this, TQT_SLOT(slotToolSelectCircle()),
+ "selectcircle", cut, this, TQ_SLOT(slotToolSelectCircle()),
actionCollection(), "edit_select_circle");
toolAction->setExclusiveGroup( "toolActions" );
toolAction->setWhatsThis(i18n("Select\n\nSelect a circular section of the"
diff --git a/tdeiconedit/tdeicongrid.cpp b/tdeiconedit/tdeicongrid.cpp
index 6d357f08..c4caedc3 100644
--- a/tdeiconedit/tdeicongrid.cpp
+++ b/tdeiconedit/tdeicongrid.cpp
@@ -127,12 +127,12 @@ KGridView::KGridView(TQImage *image, KCommandHistory* history, TQWidget *parent,
TQWhatsThis::add( _hruler, str );
TQWhatsThis::add( _vruler, str );
- connect(_grid, TQT_SIGNAL(scalingchanged(int)), TQT_SLOT(scalingChange(int)));
- connect(_grid, TQT_SIGNAL(sizechanged(int, int)), TQT_SLOT(sizeChange(int, int)));
- connect(_grid, TQT_SIGNAL(needPainting()), TQT_SLOT(paintGrid()));
- connect( _grid, TQT_SIGNAL(xposchanged(int)), _hruler, TQT_SLOT(slotNewValue(int)) );
- connect( _grid, TQT_SIGNAL(yposchanged(int)), _vruler, TQT_SLOT(slotNewValue(int)) );
- connect(viewport, TQT_SIGNAL(contentsMoving(int, int)), TQT_SLOT(moving(int, int)));
+ connect(_grid, TQ_SIGNAL(scalingchanged(int)), TQ_SLOT(scalingChange(int)));
+ connect(_grid, TQ_SIGNAL(sizechanged(int, int)), TQ_SLOT(sizeChange(int, int)));
+ connect(_grid, TQ_SIGNAL(needPainting()), TQ_SLOT(paintGrid()));
+ connect( _grid, TQ_SIGNAL(xposchanged(int)), _hruler, TQ_SLOT(slotNewValue(int)) );
+ connect( _grid, TQ_SIGNAL(yposchanged(int)), _vruler, TQ_SLOT(slotNewValue(int)) );
+ connect(viewport, TQ_SIGNAL(contentsMoving(int, int)), TQ_SLOT(moving(int, int)));
setSizes();
TQResizeEvent e(size(), size());
@@ -319,8 +319,8 @@ TDEIconEditGrid::TDEIconEditGrid(TQImage *image, KCommandHistory* h, TQWidget *p
setNumCols(32);
fill(TRANSPARENT);
- connect( kapp->clipboard(), TQT_SIGNAL(dataChanged()), TQT_SLOT(checkClipboard()));
- connect( h, TQT_SIGNAL(commandExecuted()), this, TQT_SLOT(updatePreviewPixmap() ));
+ connect( kapp->clipboard(), TQ_SIGNAL(dataChanged()), TQ_SLOT(checkClipboard()));
+ connect( h, TQ_SIGNAL(commandExecuted()), this, TQ_SLOT(updatePreviewPixmap() ));
createCursors();
TDEIconEditProperties *props = TDEIconEditProperties::self();