summaryrefslogtreecommitdiffstats
path: root/tdeiconedit
diff options
context:
space:
mode:
Diffstat (limited to 'tdeiconedit')
-rw-r--r--tdeiconedit/Makefile.am2
-rw-r--r--tdeiconedit/kcolorgrid.cpp4
-rw-r--r--tdeiconedit/kcolorgrid.h2
-rw-r--r--tdeiconedit/knew.cpp14
-rw-r--r--tdeiconedit/knew.h8
-rw-r--r--tdeiconedit/kresize.cpp2
-rw-r--r--tdeiconedit/kresize.h4
-rw-r--r--tdeiconedit/palettetoolbar.cpp20
-rw-r--r--tdeiconedit/palettetoolbar.h4
-rw-r--r--tdeiconedit/properties.cpp4
-rw-r--r--tdeiconedit/tdeicon.cpp6
-rw-r--r--tdeiconedit/tdeicon.h2
-rw-r--r--tdeiconedit/tdeiconcolors.cpp4
-rw-r--r--tdeiconedit/tdeiconcolors.h6
-rw-r--r--tdeiconedit/tdeiconconfig.cpp50
-rw-r--r--tdeiconedit/tdeiconconfig.h10
-rw-r--r--tdeiconedit/tdeiconedit.cpp186
-rw-r--r--tdeiconedit/tdeiconedit.h2
-rw-r--r--tdeiconedit/tdeicongrid.cpp48
-rw-r--r--tdeiconedit/tdeicongrid.h4
20 files changed, 191 insertions, 191 deletions
diff --git a/tdeiconedit/Makefile.am b/tdeiconedit/Makefile.am
index 2fd37a01..8435280f 100644
--- a/tdeiconedit/Makefile.am
+++ b/tdeiconedit/Makefile.am
@@ -11,7 +11,7 @@ tdeiconedit_SOURCES = utils.cpp main.cpp tdeiconedit.cpp tdeicongrid.cpp \
tdeiconedit_METASOURCES = AUTO
# the library search path.
-tdeiconedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+tdeiconedit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
tdeiconedit_LDADD = $(LIB_TDEFILE) -ltdeprint
DISTCLEANFILES = *~ .deps/* .libs/*
diff --git a/tdeiconedit/kcolorgrid.cpp b/tdeiconedit/kcolorgrid.cpp
index 131d5a9f..50d57c54 100644
--- a/tdeiconedit/kcolorgrid.cpp
+++ b/tdeiconedit/kcolorgrid.cpp
@@ -134,11 +134,11 @@ void KColorGrid::paintEvent(TQPaintEvent *e)
p.setWorldMatrix( matrix );
//p.setClipRect(j*cellsize, i*cellsize, cellsize, cellsize);
paintCell(&p, i, j);
- //p.setClipping(FALSE);
+ //p.setClipping(false);
matrix.reset();
p.setWorldMatrix( matrix );
}
- //kapp->processEvents();
+ //tdeApp->processEvents();
}
matrix.translate(-urect.x(),-urect.y());
diff --git a/tdeiconedit/kcolorgrid.h b/tdeiconedit/kcolorgrid.h
index a116f74b..b311d157 100644
--- a/tdeiconedit/kcolorgrid.h
+++ b/tdeiconedit/kcolorgrid.h
@@ -40,7 +40,7 @@ public:
class KColorGrid : public TQWidget
{
private:
- Q_OBJECT
+ TQ_OBJECT
public:
KColorGrid( TQWidget * parent = 0, const char *name = 0, int spacing = 0);
diff --git a/tdeiconedit/knew.cpp b/tdeiconedit/knew.cpp
index 2536816f..40609e99 100644
--- a/tdeiconedit/knew.cpp
+++ b/tdeiconedit/knew.cpp
@@ -71,7 +71,7 @@ void createStandardTemplates(TDEIconTemplateContainer *list)
void TDEIconTemplateContainer::save()
{
- TDEConfig *k = kapp->config();
+ TDEConfig *k = tdeApp->config();
k->setGroup("Templates");
TQStringList names;
@@ -91,7 +91,7 @@ void TDEIconTemplateContainer::save()
TDEIconTemplateContainer::TDEIconTemplateContainer() : TQValueList<TDEIconTemplate>()
{
TQStrList names;
- TDEConfig *k = kapp->config();
+ TDEConfig *k = tdeApp->config();
k->setGroup("Templates");
k->readListEntry("Names", names);
for(int i = 0; i < (int)names.count(); i++)
@@ -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/knew.h b/tdeiconedit/knew.h
index faae9684..f3176f9c 100644
--- a/tdeiconedit/knew.h
+++ b/tdeiconedit/knew.h
@@ -63,7 +63,7 @@ private:
class TDEIconListBox : public TQListBox
{
- Q_OBJECT
+ TQ_OBJECT
public:
TDEIconListBox( TQWidget *parent ) : TQListBox(parent) {} ;
@@ -96,7 +96,7 @@ private:
class NewSelect : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
NewSelect(TQWidget *parent);
@@ -116,7 +116,7 @@ protected:
class NewFromTemplate : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
NewFromTemplate(TQWidget *parent);
@@ -135,7 +135,7 @@ protected:
class KNewIcon : public KWizard
{
- Q_OBJECT
+ TQ_OBJECT
public:
KNewIcon(TQWidget *parent);
diff --git a/tdeiconedit/kresize.cpp b/tdeiconedit/kresize.cpp
index b7007238..4a46ae31 100644
--- a/tdeiconedit/kresize.cpp
+++ b/tdeiconedit/kresize.cpp
@@ -34,7 +34,7 @@ KResizeWidget::KResizeWidget( TQWidget* parent, const char* name,
TQHBoxLayout* genLayout = new TQHBoxLayout( this );
TQGroupBox* group = new TQGroupBox( i18n( "Size" ), this );
- group->setColumnLayout( 0, Qt::Horizontal );
+ group->setColumnLayout( 0, TQt::Horizontal );
genLayout->addWidget( group );
TQHBoxLayout* layout = new TQHBoxLayout( group->layout(), 6 );
diff --git a/tdeiconedit/kresize.h b/tdeiconedit/kresize.h
index fcfb18c3..a9d1e67a 100644
--- a/tdeiconedit/kresize.h
+++ b/tdeiconedit/kresize.h
@@ -28,7 +28,7 @@ class KIntSpinBox;
class KResizeWidget : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -46,7 +46,7 @@ private:
class KResizeDialog : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdeiconedit/palettetoolbar.cpp b/tdeiconedit/palettetoolbar.cpp
index 04914f2b..879acdb7 100644
--- a/tdeiconedit/palettetoolbar.cpp
+++ b/tdeiconedit/palettetoolbar.cpp
@@ -35,7 +35,7 @@ PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name )
{
TQWidget *base = new TQWidget( this );
- TQBoxLayout::Direction d = orientation() == Qt::Horizontal?
+ TQBoxLayout::Direction d = orientation() == TQt::Horizontal?
TQBoxLayout::LeftToRight : TQBoxLayout::TopToBottom;
m_layout = new TQBoxLayout( base, d, 2, 6 );
@@ -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,22 +76,22 @@ 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 );
setMovingEnabled( false );
}
-void PaletteToolBar::setOrientation( Qt::Orientation o )
+void PaletteToolBar::setOrientation( TQt::Orientation o )
{
if( barPos() == Floating )
- o = o == Qt::Vertical ? Qt::Horizontal : Qt::Vertical;
+ o = o == TQt::Vertical ? TQt::Horizontal : TQt::Vertical;
- TQBoxLayout::Direction d = o == Qt::Horizontal? TQBoxLayout::LeftToRight
+ TQBoxLayout::Direction d = o == TQt::Horizontal? TQBoxLayout::LeftToRight
: TQBoxLayout::TopToBottom;
m_layout->setDirection( d );
diff --git a/tdeiconedit/palettetoolbar.h b/tdeiconedit/palettetoolbar.h
index 42281551..254d49d0 100644
--- a/tdeiconedit/palettetoolbar.h
+++ b/tdeiconedit/palettetoolbar.h
@@ -31,7 +31,7 @@ class KCustomColors;
class PaletteToolBar : public TDEToolBar
{
- Q_OBJECT
+ TQ_OBJECT
public:
@@ -41,7 +41,7 @@ class PaletteToolBar : public TDEToolBar
void newColor( uint c );
public slots:
- virtual void setOrientation( Qt::Orientation o );
+ virtual void setOrientation( TQt::Orientation o );
void previewChanged( const TQPixmap &p );
void addColors( uint n, uint *c );
void addColor( uint color );
diff --git a/tdeiconedit/properties.cpp b/tdeiconedit/properties.cpp
index 4a90d7fe..4bd6b125 100644
--- a/tdeiconedit/properties.cpp
+++ b/tdeiconedit/properties.cpp
@@ -35,7 +35,7 @@ TDEIconEditProperties* TDEIconEditProperties::self()
TDEIconEditProperties::TDEIconEditProperties() : TQObject()
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup( "Appearance" );
@@ -92,7 +92,7 @@ TDEIconEditProperties::~TDEIconEditProperties()
void TDEIconEditProperties::save()
{
- TDEConfig *config = kapp->config();
+ TDEConfig *config = tdeApp->config();
config->setGroup( "Appearance" );
diff --git a/tdeiconedit/tdeicon.cpp b/tdeiconedit/tdeicon.cpp
index cd3ab63a..7a1eb3d9 100644
--- a/tdeiconedit/tdeicon.cpp
+++ b/tdeiconedit/tdeicon.cpp
@@ -155,7 +155,7 @@ bool TDEIconEditIcon::promptForFile(const TQImage *img)
KURL url = KFileDialog::getOpenURL( TQString(), filter );
*/
bool loaded = false;
- KURL url = KFileDialog::getImageOpenURL( TQString(), TQT_TQWIDGET(parent()) );
+ KURL url = KFileDialog::getImageOpenURL( TQString(), static_cast<TQWidget*>(parent()) );
if( !url.isEmpty() )
{
@@ -174,7 +174,7 @@ bool TDEIconEditIcon::saveAs(const TQImage *image)
TQString file;
//Get list of file types..
- KFileDialog *dialog=new KFileDialog(TQString(), TQString(), TQT_TQWIDGET(parent()), "file dialog", true);
+ KFileDialog *dialog=new KFileDialog(TQString(), TQString(), static_cast<TQWidget*>(parent()), "file dialog", true);
dialog->setCaption( i18n("Save Icon As") );
dialog->setKeepLocation( true );
dialog->setMimeFilter( KImageIO::mimeTypes(KImageIO::Writing), "image/png" );
@@ -206,7 +206,7 @@ bool TDEIconEditIcon::saveAs(const TQImage *image)
if(TQFile::exists(file))
{
- int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()),
+ int r=KMessageBox::warningContinueCancel(static_cast<TQWidget*>(parent()),
i18n( "A file named \"%1\" already exists. "
"Overwrite it?" ).arg(file),
i18n( "Overwrite File?" ),
diff --git a/tdeiconedit/tdeicon.h b/tdeiconedit/tdeicon.h
index ede75f71..7c2082d7 100644
--- a/tdeiconedit/tdeicon.h
+++ b/tdeiconedit/tdeicon.h
@@ -45,7 +45,7 @@ class TQImage;
class TDEIconEditIcon : public TQObject
{
- Q_OBJECT
+ TQ_OBJECT
public:
TDEIconEditIcon(TQObject*, const TQImage*, KURL url = KURL() );
diff --git a/tdeiconedit/tdeiconcolors.cpp b/tdeiconedit/tdeiconcolors.cpp
index 6b695fc5..16b6d687 100644
--- a/tdeiconedit/tdeiconcolors.cpp
+++ b/tdeiconedit/tdeiconcolors.cpp
@@ -58,8 +58,8 @@ void KDrawColors::mouseReleaseEvent( TQMouseEvent *e )
{
int prevSel = selected;
selected = cell;
- updateCell( prevSel/numCols(), prevSel%numCols(), FALSE );
- updateCell( row, col, FALSE );
+ updateCell( prevSel/numCols(), prevSel%numCols(), false );
+ updateCell( row, col, false );
}
emit newColor(colorAt(cell)|OPAQUE_MASK);
diff --git a/tdeiconedit/tdeiconcolors.h b/tdeiconedit/tdeiconcolors.h
index 6e12d810..f304f125 100644
--- a/tdeiconedit/tdeiconcolors.h
+++ b/tdeiconedit/tdeiconcolors.h
@@ -30,7 +30,7 @@
class KDrawColors : public KColorGrid
{
- Q_OBJECT
+ TQ_OBJECT
public:
KDrawColors(TQWidget *parent);
@@ -49,7 +49,7 @@ protected:
class KCustomColors : public KDrawColors
{
- Q_OBJECT
+ TQ_OBJECT
public:
KCustomColors(TQWidget *parent);
@@ -70,7 +70,7 @@ protected:
class KSysColors : public KDrawColors
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdeiconedit/tdeiconconfig.cpp b/tdeiconedit/tdeiconconfig.cpp
index 0fb4639a..cceeb519 100644
--- a/tdeiconedit/tdeiconconfig.cpp
+++ b/tdeiconedit/tdeiconconfig.cpp
@@ -59,19 +59,19 @@ KTemplateEditDlg::KTemplateEditDlg(TQWidget *parent)
TQFrame *frame = makeMainWidget();
TQVBoxLayout *ml = new TQVBoxLayout(frame);
TQGroupBox *grp = new TQGroupBox(i18n("Template"), frame);
- grp->setColumnLayout(0, Qt::Vertical);
+ grp->setColumnLayout(0, TQt::Vertical);
grp->layout()->setSpacing(spacingHint());
grp->layout()->setMargin(marginHint());
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);
@@ -119,13 +119,13 @@ KTemplateConfig::KTemplateConfig(TQWidget *parent) : TQWidget(parent)
btadd = btremove = btedit = 0L;
TQGroupBox* grp = new TQGroupBox( i18n( "Templates" ), this );
- grp->setColumnLayout( 0, Qt::Horizontal );
+ 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 );
@@ -245,7 +245,7 @@ KBackgroundConfig::KBackgroundConfig( TQWidget* parent )
TQVBoxLayout *mainLayout = new TQVBoxLayout( this );
TQGroupBox *grp1 = new TQGroupBox( i18n( "Select Background" ), this );
- grp1->setColumnLayout(0, Qt::Vertical );
+ grp1->setColumnLayout(0, TQt::Vertical );
grp1->layout()->setSpacing( KDialog::spacingHint() );
grp1->layout()->setMargin( KDialog::marginHint() );
mainLayout->addWidget( grp1 );
@@ -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 );
@@ -534,8 +534,8 @@ TDEIconConfig::TDEIconConfig(TQWidget *parent)
parent, "configDialog", true, true)
{
setHelp(TQString());
- //KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
- connect(this, TQT_SIGNAL(finished()), this, TQT_SLOT(finis()));
+ //KWin::setIcons(winId(), tdeApp->icon(), tdeApp->miniIcon());
+ 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/tdeiconconfig.h b/tdeiconedit/tdeiconconfig.h
index 62f7938c..8ea41045 100644
--- a/tdeiconedit/tdeiconconfig.h
+++ b/tdeiconedit/tdeiconconfig.h
@@ -40,7 +40,7 @@ class TQComboBox;
class KTemplateEditDlg : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
KTemplateEditDlg(TQWidget *);
@@ -61,7 +61,7 @@ protected:
class KTemplateConfig : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KTemplateConfig(TQWidget*);
@@ -82,7 +82,7 @@ protected:
class KBackgroundConfig : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KBackgroundConfig(TQWidget *parent);
@@ -109,7 +109,7 @@ protected:
class KMiscConfig : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMiscConfig(TQWidget *parent);
@@ -136,7 +136,7 @@ protected:
class TDEIconConfig : public KDialogBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/tdeiconedit/tdeiconedit.cpp b/tdeiconedit/tdeiconedit.cpp
index b4fe1d49..af5dcf12 100644
--- a/tdeiconedit/tdeiconedit.cpp
+++ b/tdeiconedit/tdeiconedit.cpp
@@ -55,7 +55,7 @@ void TDEIconEdit::init()
setMinimumSize( 600, 540 );
windowList.append(this);
- setCaption(kapp->caption());
+ setCaption(tdeApp->caption());
m_paletteToolBar = 0L;
statusbar = 0L;
@@ -64,7 +64,7 @@ void TDEIconEdit::init()
gridview = new KGridView(&img, history, this);
grid = gridview->grid();
- icon = new TDEIconEditIcon(TQT_TQOBJECT(this), &grid->image());
+ icon = new TDEIconEditIcon(this, &grid->image());
setAcceptDrops(true);
@@ -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());
@@ -141,7 +141,7 @@ void TDEIconEdit::init()
setCentralWidget(gridview);
- applyMainWindowSettings( kapp->config(), "MainWindowSettings" );
+ applyMainWindowSettings( tdeApp->config(), "MainWindowSettings" );
updateProperties();
updateAccels();
@@ -155,7 +155,7 @@ TDEIconEdit::~TDEIconEdit()
if (windowList.count() < 1)
{
- kapp->quit();
+ tdeApp->quit();
}
}
@@ -214,8 +214,8 @@ void TDEIconEdit::readProperties(TDEConfig *config)
*/
void TDEIconEdit::writeConfig()
{
- TDEConfig *config = kapp->config();
- m_actRecent->saveEntries( kapp->config() );
+ TDEConfig *config = tdeApp->config();
+ m_actRecent->saveEntries( tdeApp->config() );
TDEIconEditProperties::self()->save();
@@ -240,43 +240,43 @@ void TDEIconEdit::setupActions()
// File Menu
action = new TDEAction(i18n("New &Window"), "window-new", cut,
- TQT_TQOBJECT(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(TQT_TQOBJECT(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(TQT_TQOBJECT(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(TQT_TQOBJECT(this),
- TQT_SLOT(slotOpenRecent(const KURL&)), actionCollection());
+ m_actRecent = KStdAction::openRecent(this,
+ TQ_SLOT(slotOpenRecent(const KURL&)), actionCollection());
m_actRecent->setMaxItems(15); // FIXME should be configurable!
- m_actRecent->loadEntries(kapp->config());
+ m_actRecent->loadEntries(tdeApp->config());
- action = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotSave()), actionCollection());
+ action = KStdAction::save(this, TQ_SLOT(slotSave()), actionCollection());
action->setWhatsThis(i18n("Save\n\nSave the current icon"));
- KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotSaveAs()), actionCollection());
+ KStdAction::saveAs(this, TQ_SLOT(slotSaveAs()), actionCollection());
- action = KStdAction::print(TQT_TQOBJECT(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(TQT_TQOBJECT(this), TQT_SLOT(slotClose()), actionCollection());
+ KStdAction::close(this, TQ_SLOT(slotClose()), actionCollection());
// Edit Menu
- m_actCut = KStdAction::cut(TQT_TQOBJECT(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(TQT_TQOBJECT(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(TQT_TQOBJECT(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"
@@ -284,29 +284,29 @@ void TDEIconEdit::setupActions()
"(Tip: Select \"Paste transparent pixels\" in the configuration dialog"
" if you also want to paste transparency.)"));
- m_actPasteNew = new TDEAction( i18n( "Paste as &New" ), cut, TQT_TQOBJECT(grid),
- TQT_SLOT( editPasteAsNew() ), actionCollection(), "edit_paste_as_new" );
+ m_actPasteNew = new TDEAction( i18n( "Paste as &New" ), cut, grid,
+ TQ_SLOT( editPasteAsNew() ), actionCollection(), "edit_paste_as_new" );
- KStdAction::clear(TQT_TQOBJECT(this), TQT_SLOT(slotClear()), actionCollection());
- KStdAction::selectAll(TQT_TQOBJECT(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,
- TQT_TQOBJECT(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,
- TQT_TQOBJECT(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(TQT_TQOBJECT(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(TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()),
+ KStdAction::keyBindings(this, TQ_SLOT(slotConfigureKeys()),
actionCollection());
- KStdAction::preferences(TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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, TQT_TQOBJECT(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/tdeiconedit.h b/tdeiconedit/tdeiconedit.h
index 90a21d9f..42c3e35a 100644
--- a/tdeiconedit/tdeiconedit.h
+++ b/tdeiconedit/tdeiconedit.h
@@ -58,7 +58,7 @@ class PaletteToolBar;
*/
class TDEIconEdit : public TDEMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
TDEIconEdit( KURL url = KURL(), const char *name = "tdeiconedit");
diff --git a/tdeiconedit/tdeicongrid.cpp b/tdeiconedit/tdeicongrid.cpp
index b441035b..85a81751 100644
--- a/tdeiconedit/tdeicongrid.cpp
+++ b/tdeiconedit/tdeicongrid.cpp
@@ -112,12 +112,12 @@ KGridView::KGridView(TQImage *image, KCommandHistory* history, TQWidget *parent,
_corner = new TQFrame(this);
_corner->setFrameStyle(TQFrame::WinPanel | TQFrame::Raised);
- _hruler = new KRuler(Qt::Horizontal, this);
+ _hruler = new KRuler(TQt::Horizontal, this);
_hruler->setEndLabel(i18n("width"));
_hruler->setOffset( -2 );
_hruler->setRange(0, 1000);
- _vruler = new KRuler(Qt::Vertical, this);
+ _vruler = new KRuler(TQt::Vertical, this);
_vruler->setEndLabel(i18n("height"));
_vruler->setOffset( -2 );
_vruler->setRange(0, 1000);
@@ -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( tdeApp->clipboard(), TQ_SIGNAL(dataChanged()), TQ_SLOT(checkClipboard()));
+ connect( h, TQ_SIGNAL(commandExecuted()), this, TQ_SLOT(updatePreviewPixmap() ));
createCursors();
TDEIconEditProperties *props = TDEIconEditProperties::self();
@@ -710,7 +710,7 @@ void TDEIconEditGrid::paintForeground(TQPainter* p, TQPaintEvent* e)
void TDEIconEditGrid::mousePressEvent( TQMouseEvent *e )
{
- if(!e || (e->button() != Qt::LeftButton))
+ if(!e || (e->button() != TQt::LeftButton))
return;
int row = findRow( e->pos().y() );
@@ -886,7 +886,7 @@ void TDEIconEditGrid::mouseMoveEvent( TQMouseEvent *e )
void TDEIconEditGrid::mouseReleaseEvent( TQMouseEvent *e )
{
- if(!e || (e->button() != Qt::LeftButton))
+ if(!e || (e->button() != TQt::LeftButton))
return;
int row = findRow( e->pos().y() );
@@ -916,8 +916,8 @@ void TDEIconEditGrid::mouseReleaseEvent( TQMouseEvent *e )
selected = cell;
update((prevSel%numCols())*cellsize,(prevSel/numCols())*cellsize, cellsize, cellsize);
update(col*cellsize,row*cellsize, cellsize, cellsize);
- //updateCell( prevSel/numCols(), prevSel%numCols(), FALSE );
- //updateCell( row, col, FALSE );
+ //updateCell( prevSel/numCols(), prevSel%numCols(), false );
+ //updateCell( row, col, false );
*((uint*)img->scanLine(row) + col) = colorAt(cell);
p = *img;
//}
@@ -973,8 +973,8 @@ void TDEIconEditGrid::mouseReleaseEvent( TQMouseEvent *e )
update((prevSel%numCols())*cellsize,(prevSel/numCols())*cellsize, cellsize, cellsize);
update(col*cellsize,row*cellsize, cellsize, cellsize);
emit colorSelected(currentcolor);
- //updateCell( prevSel/numCols(), prevSel%numCols(), FALSE );
- //updateCell( row, col, FALSE );
+ //updateCell( prevSel/numCols(), prevSel%numCols(), false );
+ //updateCell( row, col, false );
}
break;
@@ -1035,7 +1035,7 @@ void TDEIconEditGrid::load( TQImage *image)
setColor((y*numCols())+x, *l, false);
}
//kdDebug(4640) << "Row: " << y << endl;
- kapp->processEvents(200);
+ tdeApp->processEvents(200);
}
updateColors();
@@ -1118,7 +1118,7 @@ TQImage TDEIconEditGrid::clipboardImage(bool &ok)
{
TQCString format = fileFormats.current();
TQCString type = "image/" + format.lower();
- if (kapp->clipboard()->data()->provides(type ) )
+ if (tdeApp->clipboard()->data()->provides(type ) )
{
oneIsSupported = true;
}
@@ -1130,7 +1130,7 @@ TQImage TDEIconEditGrid::clipboardImage(bool &ok)
return TQImage();
}
- TQImage image = kapp->clipboard()->image();
+ TQImage image = tdeApp->clipboard()->image();
ok = !image.isNull();
if ( ok )
{
@@ -1213,7 +1213,7 @@ TQImage TDEIconEditGrid::getSelection(bool cut)
void TDEIconEditGrid::editCopy(bool cut)
{
- kapp->clipboard()->setImage(getSelection(cut));
+ tdeApp->clipboard()->setImage(getSelection(cut));
isselecting = false;
}
@@ -1909,7 +1909,7 @@ void TDEIconEditGrid::drawPointArray(TQPointArray a, DrawAction action)
int x = a[i].x();
int y = a[i].y();
- if(img->valid(x, y) && TQT_TQRECT_OBJECT(a.boundingRect()).contains(a[ i ]))
+ if(img->valid(x, y) && a.boundingRect().contains(a[ i ]))
{
//kdDebug(4640) << "x: " << x << " - y: " << y << endl;
switch( action )
@@ -1922,7 +1922,7 @@ void TDEIconEditGrid::drawPointArray(TQPointArray a, DrawAction action)
//int cell = y * numCols() + x;
//setColor( cell, currentcolor, false );
doupdate = true;
- //updateCell( y, x, FALSE );
+ //updateCell( y, x, false );
macro->addCommand( dc );
break;
}
@@ -1993,7 +1993,7 @@ static bool kdither_32_to_8( const TQImage *src, TQImage *dst )
if ( !dst->create(src->width(), src->height(), 8, 256) ) {
kdWarning() << "OImage: destination image not valid" << endl;
- return FALSE;
+ return false;
}
int ncols = 256;
@@ -2153,7 +2153,7 @@ static bool kdither_32_to_8( const TQImage *src, TQImage *dst )
#undef MAX_B
#undef INDEXOF
- return TRUE;
+ return true;
}
// this doesn't work the way it should but the way KPixmap does.
diff --git a/tdeiconedit/tdeicongrid.h b/tdeiconedit/tdeicongrid.h
index 9f41084f..170edad1 100644
--- a/tdeiconedit/tdeicongrid.h
+++ b/tdeiconedit/tdeicongrid.h
@@ -89,7 +89,7 @@ class RepaintCommand : public KCommand {
class KGridView : public TQFrame
{
- Q_OBJECT
+ TQ_OBJECT
public:
KGridView( TQImage *image, KCommandHistory* history, TQWidget * parent = 0, const char *name = 0);
@@ -131,7 +131,7 @@ protected:
*/
class TDEIconEditGrid : public KColorGrid
{
- Q_OBJECT
+ TQ_OBJECT
public:
TDEIconEditGrid( TQImage *image, KCommandHistory* h, TQWidget * parent = 0, const char *name = 0);
generated by cgit v1.2.3 (git 2.46.0) at 2025-11-24 08:38:04 +0000