summaryrefslogtreecommitdiffstats
path: root/kiconedit
diff options
context:
space:
mode:
Diffstat (limited to 'kiconedit')
-rw-r--r--kiconedit/kcolorgrid.cpp4
-rw-r--r--kiconedit/kcolorgrid.h2
-rw-r--r--kiconedit/kicon.cpp20
-rw-r--r--kiconedit/kiconcolors.cpp6
-rw-r--r--kiconedit/kiconcolors.h6
-rw-r--r--kiconedit/kiconconfig.cpp16
-rw-r--r--kiconedit/kiconconfig.h6
-rw-r--r--kiconedit/kiconedit.cpp4
-rw-r--r--kiconedit/kicongrid.cpp34
-rw-r--r--kiconedit/kicongrid.h4
-rw-r--r--kiconedit/knew.cpp14
-rw-r--r--kiconedit/knew.h8
-rw-r--r--kiconedit/kresize.cpp8
-rw-r--r--kiconedit/kresize.h4
-rw-r--r--kiconedit/palettetoolbar.cpp4
-rw-r--r--kiconedit/palettetoolbar.h2
16 files changed, 71 insertions, 71 deletions
diff --git a/kiconedit/kcolorgrid.cpp b/kiconedit/kcolorgrid.cpp
index 837958b8..35fd9f3e 100644
--- a/kiconedit/kcolorgrid.cpp
+++ b/kiconedit/kcolorgrid.cpp
@@ -69,8 +69,8 @@ uint KColorArray::closestMatch(uint color)
return c|OPAQUE_MASK;
}
-KColorGrid::KColorGrid(TQWidget *tqparent, const char *name, int space)
- : TQWidget(tqparent, name, TQt::WResizeNoErase|TQt::WRepaintNoErase)
+KColorGrid::KColorGrid(TQWidget *parent, const char *name, int space)
+ : TQWidget(parent, name, TQt::WResizeNoErase|TQt::WRepaintNoErase)
{
//kdDebug(4640) << "KColorGrid - constructor" << endl;
s = space;
diff --git a/kiconedit/kcolorgrid.h b/kiconedit/kcolorgrid.h
index 2be09f28..a5e21fc7 100644
--- a/kiconedit/kcolorgrid.h
+++ b/kiconedit/kcolorgrid.h
@@ -43,7 +43,7 @@ private:
Q_OBJECT
TQ_OBJECT
public:
- KColorGrid( TQWidget * tqparent = 0, const char *name = 0, int spacing = 0);
+ KColorGrid( TQWidget * parent = 0, const char *name = 0, int spacing = 0);
virtual ~KColorGrid() {};
enum GridState { Plain, Shaded };
diff --git a/kiconedit/kicon.cpp b/kiconedit/kicon.cpp
index f1f31590..f36fde00 100644
--- a/kiconedit/kicon.cpp
+++ b/kiconedit/kicon.cpp
@@ -32,8 +32,8 @@
#include "kicon.h"
#include "utils.h"
-KIconEditIcon::KIconEditIcon(TQObject *tqparent, const TQImage *img, KURL url)
- : TQObject(tqparent)
+KIconEditIcon::KIconEditIcon(TQObject *parent, const TQImage *img, KURL url)
+ : TQObject(parent)
{
f = 0;
_lastdir = "/";
@@ -71,7 +71,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)
if(!url.isValid()) // Giving up
{
TQString msg = i18n("The URL: %1 \nseems to be malformed.\n").tqarg(url.url());
- KMessageBox::sorry((TQWidget*)tqparent(), msg);
+ KMessageBox::sorry((TQWidget*)parent(), msg);
return false;
}
}
@@ -84,10 +84,10 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)
}
else
{
- if(!KIO::NetAccess::download( url, filename, (TQWidget*)tqparent() ))
+ if(!KIO::NetAccess::download( url, filename, (TQWidget*)parent() ))
{
TQString msg = i18n("There was an error loading:\n%1\n").tqarg(url.prettyURL());
- KMessageBox::error((TQWidget*)tqparent(), msg);
+ KMessageBox::error((TQWidget*)parent(), msg);
return false;
}
}
@@ -102,7 +102,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url)
if(!loadedOk)
{
TQString msg = i18n("There was an error loading:\n%1\n").tqarg(url.prettyURL());
- KMessageBox::error((TQWidget*)tqparent(), msg);
+ KMessageBox::error((TQWidget*)parent(), msg);
}
else
{
@@ -155,7 +155,7 @@ bool KIconEditIcon::promptForFile(const TQImage *img)
KURL url = KFileDialog::getOpenURL( TQString(), filter );
*/
bool loaded = false;
- KURL url = KFileDialog::getImageOpenURL( TQString(), TQT_TQWIDGET(tqparent()) );
+ KURL url = KFileDialog::getImageOpenURL( TQString(), TQT_TQWIDGET(parent()) );
if( !url.isEmpty() )
{
@@ -174,7 +174,7 @@ bool KIconEditIcon::saveAs(const TQImage *image)
TQString file;
//Get list of file types..
- KFileDialog *dialog=new KFileDialog(TQString(), TQString(), TQT_TQWIDGET(tqparent()), "file dialog", true);
+ KFileDialog *dialog=new KFileDialog(TQString(), TQString(), TQT_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 KIconEditIcon::saveAs(const TQImage *image)
if(TQFile::exists(file))
{
- int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(tqparent()),
+ int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()),
i18n( "A file named \"%1\" already exists. "
"Overwrite it?" ).tqarg(file),
i18n( "Overwrite File?" ),
@@ -266,7 +266,7 @@ bool KIconEditIcon::save(const TQImage *image, const TQString &_filename)
else
{
TQString msg = i18n("There was an error saving:\n%1\n").tqarg(str);
- KMessageBox::error((TQWidget*)tqparent(), msg);
+ KMessageBox::error((TQWidget*)parent(), msg);
kdDebug(4640) << "KIconEditIcon::save - " << msg << endl;
}
diff --git a/kiconedit/kiconcolors.cpp b/kiconedit/kiconcolors.cpp
index 3bfc872d..4393379b 100644
--- a/kiconedit/kiconcolors.cpp
+++ b/kiconedit/kiconcolors.cpp
@@ -25,7 +25,7 @@
#include "kiconcolors.h"
-KDrawColors::KDrawColors(TQWidget *tqparent) : KColorGrid(tqparent, 0, 3)
+KDrawColors::KDrawColors(TQWidget *parent) : KColorGrid(parent, 0, 3)
{
kdDebug(4640) << "KDrawColors - constructor" << endl;
setCellSize(17);
@@ -65,7 +65,7 @@ void KDrawColors::mouseReleaseEvent( TQMouseEvent *e )
emit newColor(colorAt(cell)|OPAQUE_MASK);
}
-KSysColors::KSysColors(TQWidget *tqparent) : KDrawColors(tqparent)
+KSysColors::KSysColors(TQWidget *parent) : KDrawColors(parent)
{
kdDebug(4640) << "KSysColors - constructor" << endl;
@@ -85,7 +85,7 @@ KSysColors::KSysColors(TQWidget *tqparent) : KDrawColors(tqparent)
kdDebug(4640) << "KSysColors - constructor - done" << endl;
}
-KCustomColors::KCustomColors(TQWidget *tqparent) : KDrawColors(tqparent)
+KCustomColors::KCustomColors(TQWidget *parent) : KDrawColors(parent)
{
kdDebug(4640) << "KCustomColors - constructor" << endl;
setNumRows(3);
diff --git a/kiconedit/kiconcolors.h b/kiconedit/kiconcolors.h
index 90f07d09..756b84a7 100644
--- a/kiconedit/kiconcolors.h
+++ b/kiconedit/kiconcolors.h
@@ -33,7 +33,7 @@ class KDrawColors : public KColorGrid
Q_OBJECT
TQ_OBJECT
public:
- KDrawColors(TQWidget *tqparent);
+ KDrawColors(TQWidget *parent);
//bool hasColor(uint);
@@ -52,7 +52,7 @@ class KCustomColors : public KDrawColors
Q_OBJECT
TQ_OBJECT
public:
- KCustomColors(TQWidget *tqparent);
+ KCustomColors(TQWidget *parent);
~KCustomColors();
void addColor(uint);
@@ -74,7 +74,7 @@ class KSysColors : public KDrawColors
TQ_OBJECT
public:
- KSysColors(TQWidget *tqparent);
+ KSysColors(TQWidget *parent);
};
diff --git a/kiconedit/kiconconfig.cpp b/kiconedit/kiconconfig.cpp
index e0e223a5..d5db3bde 100644
--- a/kiconedit/kiconconfig.cpp
+++ b/kiconedit/kiconconfig.cpp
@@ -52,8 +52,8 @@ static inline TQPixmap loadIcon( const char * name )
->loadIcon( TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium );
}
-KTemplateEditDlg::KTemplateEditDlg(TQWidget *tqparent)
- : KDialogBase(tqparent, "KTemplateEditDlg", true, i18n( "Icon Template" ),
+KTemplateEditDlg::KTemplateEditDlg(TQWidget *parent)
+ : KDialogBase(parent, "KTemplateEditDlg", true, i18n( "Icon Template" ),
Ok|Cancel )
{
TQFrame *frame = makeMainWidget();
@@ -112,7 +112,7 @@ TQString KTemplateEditDlg::path()
return ln_path->url();
}
-KTemplateConfig::KTemplateConfig(TQWidget *tqparent) : TQWidget(tqparent)
+KTemplateConfig::KTemplateConfig(TQWidget *parent) : TQWidget(parent)
{
kdDebug(4640) << "KTemplateConfig constructor" << endl;
@@ -224,8 +224,8 @@ void KTemplateConfig::edit()
}
}
-KBackgroundConfig::KBackgroundConfig( TQWidget* tqparent )
- : TQWidget( tqparent )
+KBackgroundConfig::KBackgroundConfig( TQWidget* parent )
+ : TQWidget( parent )
{
kdDebug(4640) << "KBackgroundConfig - constructor" << endl;
@@ -373,7 +373,7 @@ void KBackgroundConfig::selectPixmap()
}
}
-KMiscConfig::KMiscConfig(TQWidget *tqparent) : TQWidget(tqparent)
+KMiscConfig::KMiscConfig(TQWidget *parent) : TQWidget(parent)
{
kdDebug(4640) << "KMiscConfig - constructor" << endl;
@@ -524,14 +524,14 @@ void KMiscConfig::slotTransparencyDisplayType(int id)
}
}
-KIconConfig::KIconConfig(TQWidget *tqparent)
+KIconConfig::KIconConfig(TQWidget *parent)
: KDialogBase(KDialogBase::IconList, i18n("Configure"),
KDialogBase::Help |
KDialogBase::Ok |
KDialogBase::Apply |
KDialogBase::Cancel,
KDialogBase::Ok,
- tqparent, "configDialog", true, true)
+ parent, "configDialog", true, true)
{
setHelp(TQString());
//KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon());
diff --git a/kiconedit/kiconconfig.h b/kiconedit/kiconconfig.h
index df143c54..1431c998 100644
--- a/kiconedit/kiconconfig.h
+++ b/kiconedit/kiconconfig.h
@@ -85,7 +85,7 @@ class KBackgroundConfig : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- KBackgroundConfig(TQWidget *tqparent);
+ KBackgroundConfig(TQWidget *parent);
~KBackgroundConfig();
public slots:
@@ -112,7 +112,7 @@ class KMiscConfig : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- KMiscConfig(TQWidget *tqparent);
+ KMiscConfig(TQWidget *parent);
~KMiscConfig();
public slots:
@@ -141,7 +141,7 @@ class KIconConfig : public KDialogBase
public:
- KIconConfig(TQWidget *tqparent);
+ KIconConfig(TQWidget *parent);
~KIconConfig();
protected slots:
diff --git a/kiconedit/kiconedit.cpp b/kiconedit/kiconedit.cpp
index f6a6c335..8a4a6af1 100644
--- a/kiconedit/kiconedit.cpp
+++ b/kiconedit/kiconedit.cpp
@@ -451,7 +451,7 @@ void KIconEdit::updateAccels()
actionCollection()->readShortcutSettings();
}
-TQWidget *KIconEdit::createContainer( TQWidget *tqparent, int index,
+TQWidget *KIconEdit::createContainer( TQWidget *parent, int index,
const TQDomElement &element, int &id )
{
if ( element.attribute( "name" ) == "paletteToolBar" )
@@ -461,7 +461,7 @@ TQWidget *KIconEdit::createContainer( TQWidget *tqparent, int index,
return m_paletteToolBar;
}
- return KXMLGUIBuilder::createContainer( tqparent, index, element, id );
+ return KXMLGUIBuilder::createContainer( parent, index, element, id );
}
bool KIconEdit::setupStatusBar()
diff --git a/kiconedit/kicongrid.cpp b/kiconedit/kicongrid.cpp
index b8ed29ab..b24db091 100644
--- a/kiconedit/kicongrid.cpp
+++ b/kiconedit/kicongrid.cpp
@@ -67,8 +67,8 @@ void RepaintCommand::execute()
grid->update( area);
}
-KGridView::KGridView(TQImage *image, KCommandHistory* history, TQWidget *tqparent, const char *name)
-: TQFrame(tqparent, name)
+KGridView::KGridView(TQImage *image, KCommandHistory* history, TQWidget *parent, const char *name)
+: TQFrame(parent, name)
{
_corner = 0L;
_hruler = _vruler = 0L;
@@ -290,8 +290,8 @@ void KGridView::resizeEvent(TQResizeEvent*)
}
-KIconEditGrid::KIconEditGrid(TQImage *image, KCommandHistory* h, TQWidget *tqparent, const char *name)
- : KColorGrid(tqparent, name, 1)
+KIconEditGrid::KIconEditGrid(TQImage *image, KCommandHistory* h, TQWidget *parent, const char *name)
+ : KColorGrid(parent, name, 1)
{
img = image;
history = h;
@@ -1426,7 +1426,7 @@ void KIconEditGrid::setSize(const TQSize s)
void KIconEditGrid::createCursors()
{
- TQBitmap tqmask(22, 22);
+ TQBitmap mask(22, 22);
TQPixmap pix;
cursor_normal = TQCursor(arrowCursor);
@@ -1439,8 +1439,8 @@ void KIconEditGrid::createCursors()
}
else
{
- tqmask = TQPixmap(pix.createHeuristicMask());
- pix.setMask(tqmask);
+ mask = TQPixmap(pix.createHeuristicMask());
+ pix.setMask(mask);
cursor_colorpicker = TQCursor(pix, 1, 21);
}
@@ -1452,8 +1452,8 @@ void KIconEditGrid::createCursors()
}
else
{
- tqmask = TQPixmap(pix.createHeuristicMask());
- pix.setMask(tqmask);
+ mask = TQPixmap(pix.createHeuristicMask());
+ pix.setMask(mask);
cursor_paint = TQCursor(pix, 0, 19);
}
@@ -1465,8 +1465,8 @@ void KIconEditGrid::createCursors()
}
else
{
- tqmask = TQPixmap(pix.createHeuristicMask());
- pix.setMask(tqmask);
+ mask = TQPixmap(pix.createHeuristicMask());
+ pix.setMask(mask);
cursor_flood = TQCursor(pix, 3, 20);
}
@@ -1478,8 +1478,8 @@ void KIconEditGrid::createCursors()
}
else
{
- tqmask = TQPixmap(pix.createHeuristicMask());
- pix.setMask(tqmask);
+ mask = TQPixmap(pix.createHeuristicMask());
+ pix.setMask(mask);
cursor_aim = TQCursor(pix, 10, 10);
}
@@ -1491,8 +1491,8 @@ void KIconEditGrid::createCursors()
}
else
{
- tqmask = TQPixmap(pix.createHeuristicMask(true));
- pix.setMask(tqmask);
+ mask = TQPixmap(pix.createHeuristicMask(true));
+ pix.setMask(mask);
cursor_spray = TQCursor(pix, 0, 20);
}
@@ -1504,8 +1504,8 @@ void KIconEditGrid::createCursors()
}
else
{
- tqmask = TQPixmap(pix.createHeuristicMask(true));
- pix.setMask(tqmask);
+ mask = TQPixmap(pix.createHeuristicMask(true));
+ pix.setMask(mask);
cursor_erase = TQCursor(pix, 1, 16);
}
}
diff --git a/kiconedit/kicongrid.h b/kiconedit/kicongrid.h
index 10e75a6f..e87ae69a 100644
--- a/kiconedit/kicongrid.h
+++ b/kiconedit/kicongrid.h
@@ -92,7 +92,7 @@ class KGridView : public TQFrame
Q_OBJECT
TQ_OBJECT
public:
- KGridView( TQImage *image, KCommandHistory* history, TQWidget * tqparent = 0, const char *name = 0);
+ KGridView( TQImage *image, KCommandHistory* history, TQWidget * parent = 0, const char *name = 0);
KRuler *hruler() { return _hruler;}
KRuler *vruler() { return _vruler;}
@@ -134,7 +134,7 @@ class KIconEditGrid : public KColorGrid
Q_OBJECT
TQ_OBJECT
public:
- KIconEditGrid( TQImage *image, KCommandHistory* h, TQWidget * tqparent = 0, const char *name = 0);
+ KIconEditGrid( TQImage *image, KCommandHistory* h, TQWidget * parent = 0, const char *name = 0);
virtual ~KIconEditGrid();
enum DrawTool { Line, Freehand, FloodFill, Spray, Rect, FilledRect, Circle,
diff --git a/kiconedit/knew.cpp b/kiconedit/knew.cpp
index b611a624..e38d58bb 100644
--- a/kiconedit/knew.cpp
+++ b/kiconedit/knew.cpp
@@ -153,9 +153,9 @@ int KIconListBoxItem::width(const TQListBox *lb ) const
return pm.width() + lb->fontMetrics().width( text() ) + 6;
}
-NewSelect::NewSelect(TQWidget *tqparent) : TQWidget( tqparent )
+NewSelect::NewSelect(TQWidget *parent) : TQWidget( parent )
{
- wiz = (KWizard*) tqparent;
+ wiz = (KWizard*) parent;
grp = new TQButtonGroup( this );
connect( grp, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( buttonClicked( int ) ) );
grp->setExclusive( true );
@@ -189,10 +189,10 @@ void NewSelect::buttonClicked(int id)
emit iconopenstyle(id);
}
-NewFromTemplate::NewFromTemplate( TQWidget* tqparent )
- : TQWidget( tqparent )
+NewFromTemplate::NewFromTemplate( TQWidget* parent )
+ : TQWidget( parent )
{
- wiz = (KWizard*) tqparent;
+ wiz = (KWizard*) parent;
TQVBoxLayout* ml = new TQVBoxLayout(this);
@@ -223,8 +223,8 @@ void NewFromTemplate::checkSelection( int )
wiz->finishButton()->setEnabled( false );
}
-KNewIcon::KNewIcon( TQWidget* tqparent )
- : KWizard( tqparent, 0, true )
+KNewIcon::KNewIcon( TQWidget* parent )
+ : KWizard( parent, 0, true )
{
//kdDebug(4640) << "KNewIcon" << endl;
setCaption( i18n( "Create New Icon" ) );
diff --git a/kiconedit/knew.h b/kiconedit/knew.h
index 4bfb7086..12aa639e 100644
--- a/kiconedit/knew.h
+++ b/kiconedit/knew.h
@@ -66,7 +66,7 @@ class KIconListBox : public TQListBox
Q_OBJECT
TQ_OBJECT
public:
- KIconListBox( TQWidget *tqparent ) : TQListBox(tqparent) {} ;
+ KIconListBox( TQWidget *parent ) : TQListBox(parent) {} ;
const TQString path(int idx) { return ((KIconListBoxItem*)item(idx))->path(); }
KIconTemplate& iconTemplate(int idx) { return ((KIconListBoxItem*)item(idx))->iconTemplate(); }
@@ -99,7 +99,7 @@ class NewSelect : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- NewSelect(TQWidget *tqparent);
+ NewSelect(TQWidget *parent);
~NewSelect();
signals:
@@ -119,7 +119,7 @@ class NewFromTemplate : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- NewFromTemplate(TQWidget *tqparent);
+ NewFromTemplate(TQWidget *parent);
~NewFromTemplate();
const TQString path() { return TQString(templates->path(templates->currentItem())); }
@@ -138,7 +138,7 @@ class KNewIcon : public KWizard
Q_OBJECT
TQ_OBJECT
public:
- KNewIcon(TQWidget *tqparent);
+ KNewIcon(TQWidget *parent);
~KNewIcon();
enum { Blank = 0, Template = 1};
diff --git a/kiconedit/kresize.cpp b/kiconedit/kresize.cpp
index b290cce7..ac98e214 100644
--- a/kiconedit/kresize.cpp
+++ b/kiconedit/kresize.cpp
@@ -28,8 +28,8 @@
#include "kresize.h"
-KResizeWidget::KResizeWidget( TQWidget* tqparent, const char* name,
- const TQSize& size ) : TQWidget( tqparent, name )
+KResizeWidget::KResizeWidget( TQWidget* parent, const char* name,
+ const TQSize& size ) : TQWidget( parent, name )
{
TQHBoxLayout* genLayout = new TQHBoxLayout( this );
@@ -62,9 +62,9 @@ const TQSize KResizeWidget::getSize()
return TQSize( m_width->value(), m_height->value() );
}
-KResizeDialog::KResizeDialog( TQWidget* tqparent, const char* name,
+KResizeDialog::KResizeDialog( TQWidget* parent, const char* name,
const TQSize size )
- : KDialogBase( tqparent, name, true, i18n( "Select Size" ), Ok|Cancel )
+ : KDialogBase( parent, name, true, i18n( "Select Size" ), Ok|Cancel )
{
m_resize = new KResizeWidget( this, "resize widget", size );
diff --git a/kiconedit/kresize.h b/kiconedit/kresize.h
index 37158ed3..c0d2574e 100644
--- a/kiconedit/kresize.h
+++ b/kiconedit/kresize.h
@@ -33,7 +33,7 @@ class KResizeWidget : public TQWidget
public:
- KResizeWidget( TQWidget* tqparent, const char* name, const TQSize& );
+ KResizeWidget( TQWidget* parent, const char* name, const TQSize& );
~KResizeWidget();
const TQSize getSize();
@@ -51,7 +51,7 @@ class KResizeDialog : public KDialogBase
public:
- KResizeDialog( TQWidget* tqparent, const char* name, const TQSize s );
+ KResizeDialog( TQWidget* parent, const char* name, const TQSize s );
~KResizeDialog();
const TQSize getSize();
diff --git a/kiconedit/palettetoolbar.cpp b/kiconedit/palettetoolbar.cpp
index abd48737..225e2439 100644
--- a/kiconedit/palettetoolbar.cpp
+++ b/kiconedit/palettetoolbar.cpp
@@ -30,8 +30,8 @@
#include "kiconcolors.h"
#include "palettetoolbar.h"
-PaletteToolBar::PaletteToolBar( TQWidget *tqparent, const char *name )
- : KToolBar( tqparent, name )
+PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name )
+ : KToolBar( parent, name )
{
TQWidget *base = new TQWidget( this );
diff --git a/kiconedit/palettetoolbar.h b/kiconedit/palettetoolbar.h
index 0e53914e..3c0cc329 100644
--- a/kiconedit/palettetoolbar.h
+++ b/kiconedit/palettetoolbar.h
@@ -35,7 +35,7 @@ class PaletteToolBar : public KToolBar
TQ_OBJECT
public:
- PaletteToolBar( TQWidget *tqparent, const char *name = 0L );
+ PaletteToolBar( TQWidget *parent, const char *name = 0L );
signals:
void newColor( uint c );