rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

kamera/kcontrol/kamera.cpp

@@ -48,8 +48,8 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kamera, KKameraConfigFactory( "kcmkamera" ) )
 
 KKameraConfig *KKameraConfig::m_instance = NULL;
 
-KKameraConfig::KKameraConfig(TQWidget *tqparent, const char *name, const TQStringList &)
+KKameraConfig::KKameraConfig(TQWidget *parent, const char *name, const TQStringList &)
-	: KCModule(KKameraConfigFactory::instance(), tqparent, name)
+	: KCModule(KKameraConfigFactory::instance(), parent, name)
 {
 	m_devicePopup = new KPopupMenu(this);
 	m_actions = new KActionCollection(this);

kamera/kcontrol/kamera.h

@@ -51,7 +51,7 @@ class KKameraConfig : public KCModule
 	friend class KameraDeviceSelectDialog;
 
 public:
-	KKameraConfig(TQWidget *tqparent, const char *name, const TQStringList &);
+	KKameraConfig(TQWidget *parent, const char *name, const TQStringList &);
 	virtual ~KKameraConfig();
 
 	// KCModule interface methods

kamera/kcontrol/kameraconfigdialog.cpp

@@ -42,9 +42,9 @@
 
 KameraConfigDialog::KameraConfigDialog(Camera */*camera*/,
 					CameraWidget *widget,
-					TQWidget *tqparent,
+					TQWidget *parent,
 					const char *name) :
-KDialogBase(tqparent, name, true, TQString(), Ok|Cancel, Ok ),
+KDialogBase(parent, name, true, TQString(), Ok|Cancel, Ok ),
 m_widgetRoot(widget)
 {
     TQFrame *main = makeMainWidget();
@@ -56,9 +56,9 @@ m_widgetRoot(widget)
 	appendWidget(main, widget);
 }
 
-void KameraConfigDialog::appendWidget(TQWidget *tqparent, CameraWidget *widget)
+void KameraConfigDialog::appendWidget(TQWidget *parent, CameraWidget *widget)
 {
-	TQWidget *newParent = tqparent;
+	TQWidget *newParent = parent;
 	
 	CameraWidgetType widget_type;
 	const char *widget_name;
@@ -74,7 +74,7 @@ void KameraConfigDialog::appendWidget(TQWidget *tqparent, CameraWidget *widget)
 	
 	TQString whats_this = TQString::fromLocal8Bit(widget_info);	// gphoto2 doesn't seem to have any standard for i18n
 
-	// Add this widget to tqparent
+	// Add this widget to parent
 	switch(widget_type) {
 	case GP_WIDGET_WINDOW:
 		{
@@ -85,7 +85,7 @@ void KameraConfigDialog::appendWidget(TQWidget *tqparent, CameraWidget *widget)
 	case GP_WIDGET_SECTION:
 		{
 			if (!m_tabWidget)
-				m_tabWidget = new TQTabWidget(tqparent);
+				m_tabWidget = new TQTabWidget(parent);
 			TQWidget *tab = new TQWidget(m_tabWidget);
 			// widgets are to be aligned vertically in the tab
 			TQVBoxLayout *tabLayout = new TQVBoxLayout(tab, marginHint(),
@@ -104,7 +104,7 @@ void KameraConfigDialog::appendWidget(TQWidget *tqparent, CameraWidget *widget)
 		{
 			gp_widget_get_value(widget, &widget_value_string);
 
-			TQGrid *grid = new TQGrid(2,Qt::Horizontal, tqparent);
+			TQGrid *grid = new TQGrid(2,Qt::Horizontal, parent);
 			grid->setSpacing(spacingHint());
 			new TQLabel(TQString::fromLocal8Bit( widget_label )+":", grid);
 			TQLineEdit *lineEdit = new TQLineEdit(widget_value_string, grid);
@@ -123,7 +123,7 @@ void KameraConfigDialog::appendWidget(TQWidget *tqparent, CameraWidget *widget)
 			gp_widget_get_range(widget, &widget_low, &widget_high, &widget_increment);
 			gp_widget_get_value(widget, &widget_value_float);
 	
-			TQGroupBox *groupBox = new TQVGroupBox(widget_label, tqparent);
+			TQGroupBox *groupBox = new TQVGroupBox(widget_label, parent);
 			TQSlider *slider = new TQSlider(
 				( int )widget_low,
 				( int )widget_high,
@@ -142,7 +142,7 @@ void KameraConfigDialog::appendWidget(TQWidget *tqparent, CameraWidget *widget)
 		{
 			gp_widget_get_value(widget, &widget_value_int);
 		
-			TQCheckBox *checkBox = new TQCheckBox(widget_label, tqparent);
+			TQCheckBox *checkBox = new TQCheckBox(widget_label, parent);
 			checkBox->setChecked(widget_value_int);
 			m_wmap.insert(widget, checkBox);
 
@@ -160,9 +160,9 @@ void KameraConfigDialog::appendWidget(TQWidget *tqparent, CameraWidget *widget)
 			// for less than 5 options, align them horizontally
 			TQButtonGroup *buttonGroup;
 			if (count > 4)
-				buttonGroup = new TQVButtonGroup(widget_label, tqparent);
+				buttonGroup = new TQVButtonGroup(widget_label, parent);
 			else
-				buttonGroup = new TQHButtonGroup(widget_label, tqparent);
+				buttonGroup = new TQHButtonGroup(widget_label, parent);
 			
 			for(int i = 0; i < count; ++i) {
 				const char *widget_choice;
@@ -183,7 +183,7 @@ void KameraConfigDialog::appendWidget(TQWidget *tqparent, CameraWidget *widget)
 		{
 			gp_widget_get_value(widget, &widget_value_string);
 	
-			TQComboBox *comboBox = new TQComboBox(FALSE, tqparent);
+			TQComboBox *comboBox = new TQComboBox(FALSE, parent);
 			comboBox->clear();
 			for(int i = 0; i < gp_widget_count_choices(widget); ++i) {
 				const char *widget_choice;
@@ -206,14 +206,14 @@ void KameraConfigDialog::appendWidget(TQWidget *tqparent, CameraWidget *widget)
 			// I can't see a way of implementing this. Since there is
 			// no way of telling which button sent you a signal, we
 			// can't map to the appropriate widget->callback
-			new TQLabel(i18n("Button (not supported by KControl)"), tqparent);
+			new TQLabel(i18n("Button (not supported by KControl)"), parent);
 	
 			break;
 		}
 	case GP_WIDGET_DATE:
 		{
 			// TODO
-			new TQLabel(i18n("Date (not supported by KControl)"), tqparent);
+			new TQLabel(i18n("Date (not supported by KControl)"), parent);
 
 			break;
 		}

kamera/kcontrol/kameraconfigdialog.h

@@ -37,13 +37,13 @@ class KameraConfigDialog : public KDialogBase
   TQ_OBJECT
 public:
 	KameraConfigDialog(Camera *camera, CameraWidget *widget,
-			   TQWidget *tqparent = 0, const char *name = 0);
+			   TQWidget *parent = 0, const char *name = 0);
 
 private slots:
 	void slotOk();
 
 private:
-	void appendWidget(TQWidget *tqparent, CameraWidget *widget);
+	void appendWidget(TQWidget *parent, CameraWidget *widget);
 	void updateWidgetValue(CameraWidget *widget);
 	
 	TQMap<CameraWidget *, TQWidget *> m_wmap;

kamera/kcontrol/kameradevice.cpp

@@ -270,8 +270,8 @@ CameraAbilities KCamera::abilities()
 
 // ---------- KameraSelectCamera ------------
 
-KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *tqparent, KCamera *device)
+KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *device)
-	: KDialogBase(tqparent, "kkameradeviceselect", true, i18n("Select Camera Device"), Ok | Cancel, Ok, true)
+	: KDialogBase(parent, "kkameradeviceselect", true, i18n("Select Camera Device"), Ok | Cancel, Ok, true)
 {
 	m_device = device;
 	connect(m_device, TQT_SIGNAL(error(const TQString &)),

kamera/kcontrol/kameradevice.h

@@ -91,7 +91,7 @@ class KameraDeviceSelectDialog : public KDialogBase
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KameraDeviceSelectDialog(TQWidget *tqparent, KCamera *device);
+	KameraDeviceSelectDialog(TQWidget *parent, KCamera *device);
 	void save();
 	void load();
 protected slots:

kamera/kioslave/kamera.cpp

@@ -890,7 +890,7 @@ void KameraProtocol::translateFileToUDS(UDSEntry &udsEntry, const CameraFileInfo
 		atom.m_long = 0;
 		atom.m_long |= (info.file.permissions & GP_FILE_PERM_READ) ? (S_IRUSR | S_IRGRP | S_IROTH) : 0;
 		// we cannot represent individual FP_FILE_PERM_DELETE permission in the Unix access scheme
-		// since the tqparent directory's write permission defines that
+		// since the parent directory's write permission defines that
 		udsEntry.append(atom);
 	} else {
 		// basic permissions, in case the camera doesn't provide permissions info

kcoloredit/colorselector.cpp

@@ -30,7 +30,7 @@
 #include "texteditselection.h"
 #include "colorselector.h"
 
-ColorSelector::ColorSelector(TQWidget *tqparent, const char *name ) : TQWidget(tqparent, name) {
+ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(parent, name) {
 	fComponentsMode = false;
 	TQVBoxLayout* topLayout = new TQVBoxLayout(this, 4);
 	/*

kcoloredit/colorselector.h

@@ -35,7 +35,7 @@ class ColorSelector : public TQWidget  {
 
 public:
 	/** constructs a color selector widget */
-	ColorSelector(TQWidget *tqparent=0, const char *name=0);
+	ColorSelector(TQWidget *parent=0, const char *name=0);
 	~ColorSelector();
 	/** @return the selected color */
 	const Color& color();

kcoloredit/gradientselection.cpp

@@ -24,7 +24,7 @@
 #include "main.h"
 #include "gradientselection.h"
 
-GradientSelection::GradientSelection(TQWidget *tqparent, const char *name ) : TQWidget(tqparent,name) {
+GradientSelection::GradientSelection(TQWidget *parent, const char *name ) : TQWidget(parent,name) {
 	TQGridLayout* topLayout = new TQGridLayout(this, 2, 2, 0);
 	TQHBoxLayout* tqlayout = new TQHBoxLayout(0);
 	tqlayout->setMargin(3);

kcoloredit/gradientselection.h

@@ -36,7 +36,7 @@ class GradientSelection : public TQWidget  {
 
 public:
 	/** Constructs the widget */
-	GradientSelection(TQWidget *tqparent=0, const char *name=0);
+	GradientSelection(TQWidget *parent=0, const char *name=0);
 	~GradientSelection();
 	/** Enables or disables the color synchronize button */
 	void enableSynchronizeColorButton(bool enable);

kcoloredit/imageselection.cpp

@@ -17,7 +17,7 @@
 
 #include "imageselection.h"
 
-ImageSelection::ImageSelection(TQWidget *tqparent, const char *name ) : TQWidget(tqparent,name) {
+ImageSelection::ImageSelection(TQWidget *parent, const char *name ) : TQWidget(parent,name) {
 }
 ImageSelection::~ImageSelection(){
 }

kcoloredit/imageselection.h

@@ -31,7 +31,7 @@ class ImageSelection : public TQWidget  {
 
 public:
 	/** constructs the widget */
-	ImageSelection(TQWidget *tqparent=0, const char *name=0);
+	ImageSelection(TQWidget *parent=0, const char *name=0);
 	~ImageSelection();
 	
 signals:

kcoloredit/kcoloreditdoc.cpp

@@ -31,7 +31,7 @@
 #include "kcoloreditview.h"
 #include "resource.h"
 
-KColorEditDoc::KColorEditDoc(TQWidget *tqparent, const char *name) : TQObject(tqparent, name),
+KColorEditDoc::KColorEditDoc(TQWidget *parent, const char *name) : TQObject(parent, name),
 	m_palette(), m_paletteHistory(&m_palette, 0) {
 	m_pViewList = new TQPtrList<KColorEditView>();
 	m_pViewList->setAutoDelete(true);
@@ -106,7 +106,7 @@ bool KColorEditDoc::saveModified()
 
   if(m_modified)
   {
-    KColorEditApp *window=(KColorEditApp *) tqparent();
+    KColorEditApp *window=(KColorEditApp *) parent();
     int want_save = KMessageBox::warningYesNoCancel(window,
                                          i18n("The current file has been modified.\n"
                                               "Do you want to save it?"), TQString(), KStdGuiItem::save(), i18n("Do Not Save"));
@@ -175,7 +175,7 @@ bool KColorEditDoc::openDocument(const TQString& filename) {
 		setPaletteCursorPos(m_palette.length());
 		setPaletteSelection(0, 0);
 		slotRedrawAllViews(0, true);
-        KColorEditApp *window=(KColorEditApp*)tqparent();
+        KColorEditApp *window=(KColorEditApp*)parent();
         window->setCaption(m_title);
 	}
 	return true;

kcoloredit/kcoloreditdoc.h

@@ -51,7 +51,7 @@ class KColorEditDoc : public TQObject
 
   public:
     /** Constructor for the fileclass of the application */
-    KColorEditDoc(TQWidget *tqparent, const char *name=0);
+    KColorEditDoc(TQWidget *parent, const char *name=0);
     /** Destructor for the fileclass of the application */
     ~KColorEditDoc();
 

kcoloredit/kcoloreditview.cpp

@@ -35,7 +35,7 @@
 #include "kcoloredit.h"
 #include "palette.h"
 
-KColorEditView::KColorEditView(TQWidget *tqparent, const char *name) : TQSplitter(tqparent, name) {
+KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter(parent, name) {
 	colorSelector = new ColorSelector(this);
 	colorSelector->slotSetColor(
 		Color( RGB_MAX_COMPONENT_VALUE, RGB_MAX_COMPONENT_VALUE, RGB_MAX_COMPONENT_VALUE, "" ));

kcoloredit/kcoloreditview.h

@@ -47,11 +47,11 @@ class KColorEditView : public TQSplitter {
 
   public:
     /** Constructor for the main view */
-    KColorEditView(TQWidget *tqparent = 0, const char *name = 0);
+    KColorEditView(TQWidget *parent = 0, const char *name = 0);
     /** Destructor for the main view */
     ~KColorEditView();
 
-    /** returns a pointer to the document connected to the view instance. Mind that this method requires a KColorEditApp instance as a tqparent
+    /** returns a pointer to the document connected to the view instance. Mind that this method requires a KColorEditApp instance as a parent
      * widget to get to the window document pointer by calling the KColorEditApp::getDocument() method.
      *
      * @see KColorEditApp#getDocument

kcoloredit/kxycolorselector.cpp

@@ -23,7 +23,7 @@
 
 #include "kxycolorselector.h"
 
-KXYColorSelector::KXYColorSelector(TQWidget *tqparent, const char *name) : KXYSelector(tqparent,name) {
+KXYColorSelector::KXYColorSelector(TQWidget *parent, const char *name) : KXYSelector(parent,name) {
 	setBackgroundMode(NoBackground);
 	setRange(0, 0, COMPONENT_SELECTION_RESOLUTION - 1, COMPONENT_SELECTION_RESOLUTION - 1);
 	setType(TYPE_NONE);

kcoloredit/kxycolorselector.h

@@ -47,7 +47,7 @@ public:
 	/** Constructs a two-dimensional color component selector widget,
 	 *  with a type TYPE_NONE and ranges 0 .. MAX_COLOR_COMPONENT_VALUE
 	 */
-	KXYColorSelector(TQWidget *tqparent=0, const char *name=0);
+	KXYColorSelector(TQWidget *parent=0, const char *name=0);
 	~KXYColorSelector();
 	/** Set the type of the selector */
 	void setType(const int type);

kcoloredit/kzcolorselector.cpp

@@ -23,8 +23,8 @@
 #include "main.h"
 #include "kzcolorselector.h"
 
-KZColorSelector::KZColorSelector(Qt::Orientation o, TQWidget *tqparent, const char *name) :
+KZColorSelector::KZColorSelector(Qt::Orientation o, TQWidget *parent, const char *name) :
-	KSelector(o, tqparent, name) {
+	KSelector(o, parent, name) {
 	baseColorH = -1;
 	baseColorS = 0;
 	baseColorV = 0;

kcoloredit/kzcolorselector.h

@@ -38,7 +38,7 @@ public:
 	       TYPE_V = 2 };
 
 	/** Constructs the widget */
-	KZColorSelector(Qt::Orientation o, TQWidget *tqparent=0, const char *name=0);
+	KZColorSelector(Qt::Orientation o, TQWidget *parent=0, const char *name=0);
 	~KZColorSelector();
 	/** Sets the selector type */
 	void setType(const int type);

kcoloredit/loadpalettedlg.cpp

@@ -31,8 +31,8 @@
 #include "palette.h"
 #include "loadpalettedlg.h"
 
-LoadPaletteDlg::LoadPaletteDlg(TQWidget *tqparent, const char *name) 
+LoadPaletteDlg::LoadPaletteDlg(TQWidget *parent, const char *name) 
-        : KDialogBase(tqparent, name, true, i18n( "Load Palette" ), 
+        : KDialogBase(parent, name, true, i18n( "Load Palette" ), 
           Ok|Cancel, Ok, true) {
 	fileName = "";
     TQWidget *mainWidget = new TQWidget( this );

kcoloredit/loadpalettedlg.h

@@ -32,7 +32,7 @@ class LoadPaletteDlg : public KDialogBase  {
 public:
 	/** constructs the dialog
 	 */
-	LoadPaletteDlg(TQWidget *tqparent = 0, const char *name = 0);
+	LoadPaletteDlg(TQWidget *parent = 0, const char *name = 0);
 	~LoadPaletteDlg();
 	/** @return the fetched file name
 	 */

kcoloredit/paletteview.cpp

@@ -21,8 +21,8 @@
 #include "paletteview.h"
 
 PaletteView::PaletteView(const int defaultCellWidth, const int defaultCellHeight, const int cellSpacing,
-	KColorEditView* view, TQWidget *tqparent, const char *name) :
+	KColorEditView* view, TQWidget *parent, const char *name) :
-	TQFrame(tqparent, name, TQWidget::WResizeNoErase*0) {
+	TQFrame(parent, name, TQWidget::WResizeNoErase*0) {
 	setFrameStyle(StyledPanel|Sunken);
 	setLineWidth(2);
 	TQGridLayout* topLayout = new TQGridLayout(this, 2, 2);

kcoloredit/paletteview.h

@@ -26,7 +26,7 @@
 class KColorEditView;
 
 /** This is a Palette class view widget.
-  * Its tqparent is KColorEditView
+  * Its parent is KColorEditView
   * @author Artur Rataj
   */
 class PaletteView : public TQFrame {
@@ -38,7 +38,7 @@ public:
 	 *  The effective cell sizes may be adjusted to fit the widget sizes.
 	 */
 	PaletteView(const int defaultCellWidth, const int defaultCellHeight, const int cellSpacing,
-			KColorEditView* view, TQWidget *tqparent = 0, const char *name=0);
+			KColorEditView* view, TQWidget *parent = 0, const char *name=0);
 	~PaletteView();
 	/** Calls redraw() in scrolledArea */
 	void redraw();

kcoloredit/paletteviewscrolledarea.cpp

@@ -38,8 +38,8 @@
 
 PaletteViewScrolledArea::PaletteViewScrolledArea(const int defaultCellWidth,
 	const int defaultCellHeight, const int cellSpacing, TQScrollBar* scrollBar,
-	TQScrollBar* hScrollBar, KColorEditView* view, TQWidget* tqparent, const char* name)
+	TQScrollBar* hScrollBar, KColorEditView* view, TQWidget* parent, const char* name)
-	: TQFrame(tqparent, name) {
+	: TQFrame(parent, name) {
 	this->defaultCellWidth = defaultCellWidth;
 	this->defaultCellHeight = defaultCellHeight;
 	this->cellSpacing = cellSpacing;

kcoloredit/paletteviewscrolledarea.h

@@ -40,7 +40,7 @@ public:
 	PaletteViewScrolledArea(const int defaultCellWidth, const int defaultCellHeight,
 		const int cellSpacing, TQScrollBar* scrollBar,
 		TQScrollBar* hScrollBar, KColorEditView* view,
-		TQWidget* tqparent = 0, const char* name = 0);
+		TQWidget* parent = 0, const char* name = 0);
 	~PaletteViewScrolledArea();
 	/** Sets cells sizes and then calls repaintPalette() */
 	void redraw();

kcoloredit/texteditselection.cpp

@@ -24,7 +24,7 @@
 #include "main.h"
 #include "texteditselection.h"
 
-TextEditSelection::TextEditSelection(TQWidget *tqparent, const char *name ) : TQWidget(tqparent,name) {
+TextEditSelection::TextEditSelection(TQWidget *parent, const char *name ) : TQWidget(parent,name) {
 	inChangingComponents = false;
 	TQVBoxLayout* topLayout = new TQVBoxLayout(this, 4);
 	TQGridLayout* componentsLayout = new TQGridLayout(3, 5, 2);

kcoloredit/texteditselection.h

@@ -34,7 +34,7 @@ class TextEditSelection : public TQWidget  {
 
 public:
 	/** Constructs the widget */
-	TextEditSelection(TQWidget *tqparent=0, const char *name=0);
+	TextEditSelection(TQWidget *parent=0, const char *name=0);
 	~TextEditSelection();
 	
 signals:

kcoloredit/textselection.cpp

@@ -17,7 +17,7 @@
 
 #include "textselection.h"
 
-TextSelection::TextSelection(TQWidget *tqparent, const char *name ) : TQWidget(tqparent,name) {
+TextSelection::TextSelection(TQWidget *parent, const char *name ) : TQWidget(parent,name) {
 	
 }
 TextSelection::~TextSelection(){

kdvi/TeXFont.h

@@ -17,7 +17,7 @@ class TeXFont {
  public:
   TeXFont(TeXFontDefinition *_parent)
     {
-      tqparent       = _parent;
+      parent       = _parent;
       errorMessage = TQString();
     };
   
@@ -42,7 +42,7 @@ class TeXFont {
    
  protected:
   glyph              glyphtable[TeXFontDefinition::max_num_of_chars_in_font];
-  TeXFontDefinition *tqparent;
+  TeXFontDefinition *parent;
 };
 
 #endif

kdvi/TeXFont_PFB.cpp

@@ -26,28 +26,28 @@
 //#define DEBUG_PFB 1
 
 
-TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *tqparent, fontEncoding *enc, double slant)
+TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *parent, fontEncoding *enc, double slant)
-  : TeXFont(tqparent)
+  : TeXFont(parent)
 {
 #ifdef DEBUG_PFB
   if (enc != 0)
-    kdDebug(4300) << "TeXFont_PFB::TeXFont_PFB( tqparent=" << tqparent << ", encoding=" << enc->encodingFullName << " )" << endl;
+    kdDebug(4300) << "TeXFont_PFB::TeXFont_PFB( parent=" << parent << ", encoding=" << enc->encodingFullName << " )" << endl;
   else
-    kdDebug(4300) << "TeXFont_PFB::TeXFont_PFB( tqparent=" << tqparent << ", encoding=0 )" << endl;
+    kdDebug(4300) << "TeXFont_PFB::TeXFont_PFB( parent=" << parent << ", encoding=0 )" << endl;
 #endif
 
   fatalErrorInFontLoading = false;
 
-  int error = FT_New_Face( tqparent->font_pool->FreeType_library, tqparent->filename.local8Bit(), 0, &face );
+  int error = FT_New_Face( parent->font_pool->FreeType_library, parent->filename.local8Bit(), 0, &face );
   
   if ( error == FT_Err_Unknown_File_Format ) {
-    errorMessage = i18n("The font file %1 could be opened and read, but its font format is unsupported.").tqarg(tqparent->filename);
+    errorMessage = i18n("The font file %1 could be opened and read, but its font format is unsupported.").tqarg(parent->filename);
     kdError(4300) << errorMessage << endl;
     fatalErrorInFontLoading = true;
     return;
   } else 
     if ( error ) {
-      errorMessage = i18n("The font file %1 is broken, or it could not be opened or read.").tqarg(tqparent->filename);
+      errorMessage = i18n("The font file %1 is broken, or it could not be opened or read.").tqarg(parent->filename);
       kdError(4300) << errorMessage << endl;
       fatalErrorInFontLoading = true;
       return;
@@ -66,7 +66,7 @@ TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *tqparent, fontEncoding *enc, double
   }
   
   if (face->family_name != 0)
-    tqparent->fullFontName = face->family_name;
+    parent->fullFontName = face->family_name;
 
   // Finally, we need to set up the charMap array, which maps TeX
   // character codes to glyph indices in the font. (Remark: the
@@ -74,8 +74,8 @@ TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *tqparent, fontEncoding *enc, double
   // TeX is only able to address character codes 0-255 while
   // e.g. Type1 fonts may contain several thousands of characters)
   if (enc != 0) {
-    tqparent->fullEncodingName = enc->encodingFullName.remove(TQString::tqfromLatin1( "Encoding" ));
+    parent->fullEncodingName = enc->encodingFullName.remove(TQString::tqfromLatin1( "Encoding" ));
-    tqparent->fullEncodingName = enc->encodingFullName.remove(TQString::tqfromLatin1( "encoding" ));
+    parent->fullEncodingName = enc->encodingFullName.remove(TQString::tqfromLatin1( "encoding" ));
 
     // An encoding vector is given for this font, i.e. an array of
     // character names (such as: 'parenleft' or 'dotlessj'). We use
@@ -159,16 +159,16 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
   
   if ((generateCharacterPixmap == true) && ((g->shrunkenCharacter.isNull()) || (color != g->color)) ) {
     int error;
-    unsigned int res =  (unsigned int)(tqparent->displayResolution_in_dpi/tqparent->enlargement +0.5);
+    unsigned int res =  (unsigned int)(parent->displayResolution_in_dpi/parent->enlargement +0.5);
     g->color = color;
 
     // Character height in 1/64th of points (reminder: 1 pt = 1/72 inch)
     // Only approximate, may vary from file to file!!!! @@@@@
 
-    long int characterSize_in_printers_points_by_64 = (long int)((64.0*72.0*tqparent->scaled_size_in_DVI_units*tqparent->font_pool->getCMperDVIunit())/2.54 + 0.5 ); 
+    long int characterSize_in_printers_points_by_64 = (long int)((64.0*72.0*parent->scaled_size_in_DVI_units*parent->font_pool->getCMperDVIunit())/2.54 + 0.5 ); 
     error = FT_Set_Char_Size(face, 0, characterSize_in_printers_points_by_64, res, res );
     if (error) {
-      TQString msg = i18n("FreeType reported an error when setting the character size for font file %1.").tqarg(tqparent->filename);
+      TQString msg = i18n("FreeType reported an error when setting the character size for font file %1.").tqarg(parent->filename);
       if (errorMessage.isEmpty())
 	errorMessage = msg;
       kdError(4300) << msg << endl;
@@ -178,13 +178,13 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
     }
     
     // load glyph image into the slot and erase the previous one
-    if (tqparent->font_pool->getUseFontHints() == true)
+    if (parent->font_pool->getUseFontHints() == true)
       error = FT_Load_Glyph(face, charMap[ch], FT_LOAD_DEFAULT ); 
     else
       error = FT_Load_Glyph(face, charMap[ch], FT_LOAD_NO_HINTING );
 
     if (error) {
-      TQString msg = i18n("FreeType is unable to load glyph #%1 from font file %2.").tqarg(ch).tqarg(tqparent->filename);
+      TQString msg = i18n("FreeType is unable to load glyph #%1 from font file %2.").tqarg(ch).tqarg(parent->filename);
       if (errorMessage.isEmpty())
 	errorMessage = msg;
       kdError(4300) << msg << endl;
@@ -196,7 +196,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
     // convert to an anti-aliased bitmap
     error = FT_Render_Glyph( face->glyph, ft_render_mode_normal );
     if (error) {
-      TQString msg = i18n("FreeType is unable to render glyph #%1 from font file %2.").tqarg(ch).tqarg(tqparent->filename);
+      TQString msg = i18n("FreeType is unable to render glyph #%1 from font file %2.").tqarg(ch).tqarg(parent->filename);
       if (errorMessage.isEmpty())
 	errorMessage = msg;
       kdError(4300) << msg << endl;
@@ -210,7 +210,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
     if ((slot->bitmap.width == 0) || (slot->bitmap.rows == 0)) {
       if (errorMessage.isEmpty())
 	errorMessage = i18n("Glyph #%1 is empty.").tqarg(ch);
-      kdError(4300) << i18n("Glyph #%1 from font file %2 is empty.").tqarg(ch).tqarg(tqparent->filename) << endl;
+      kdError(4300) << i18n("Glyph #%1 from font file %2 is empty.").tqarg(ch).tqarg(parent->filename) << endl;
       g->shrunkenCharacter.resize( 15, 15 );
       g->shrunkenCharacter.fill(TQColor(255, 0, 0));
       g->x2 = 0;
@@ -221,7 +221,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
 
       // Do TQPixmaps fully support the alpha channel? If yes, we use
       // that. Otherwise, use other routines as a fallback
-      if (tqparent->font_pool->TQPixmapSupportsAlpha) {
+      if (parent->font_pool->TQPixmapSupportsAlpha) {
 	// If the alpha channel is properly supported, we set the
 	// character glyph to a colored rectangle, and define the
 	// character outline only using the alpha channel. That
@@ -239,7 +239,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
 	}
       } else {
 	// If the alpha channel is not supported... QT seems to turn
-	// the alpha channel into a crude bitmap which is used to tqmask
+	// the alpha channel into a crude bitmap which is used to mask
 	// the resulting TQPixmap. In this case, we define the
 	// character outline using the image data, and use the alpha
 	// channel only to store "maximally opaque" or "completely
@@ -279,7 +279,7 @@ glyph *TeXFont_PFB::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const T
   if (g->dvi_advance_in_units_of_design_size_by_2e20 == 0) {
     int error = FT_Load_Glyph(face, charMap[ch], FT_LOAD_NO_SCALE);
     if (error) {
-      TQString msg = i18n("FreeType is unable to load metric for glyph #%1 from font file %2.").tqarg(ch).tqarg(tqparent->filename);
+      TQString msg = i18n("FreeType is unable to load metric for glyph #%1 from font file %2.").tqarg(ch).tqarg(parent->filename);
       if (errorMessage.isEmpty())
 	errorMessage = msg;
       kdError(4300) << msg << endl;

kdvi/TeXFont_PFB.h

@@ -23,7 +23,7 @@ class glyph;
 
 class TeXFont_PFB : public TeXFont {
  public:
-  TeXFont_PFB(TeXFontDefinition *tqparent, fontEncoding *enc=0, double slant=0.0 );
+  TeXFont_PFB(TeXFontDefinition *parent, fontEncoding *enc=0, double slant=0.0 );
   ~TeXFont_PFB();
   
   glyph* getGlyph(TQ_UINT16 character, bool generateCharacterPixmap=false, const TQColor& color=TQt::black);

kdvi/TeXFont_PK.cpp

@@ -80,18 +80,18 @@ extern void oops(TQString message);
 
 
 
-TeXFont_PK::TeXFont_PK(TeXFontDefinition *tqparent)
+TeXFont_PK::TeXFont_PK(TeXFontDefinition *parent)
-  : TeXFont(tqparent)
+  : TeXFont(parent)
 {
 #ifdef DEBUG_PK
-  kdDebug(4300) << "TeXFont_PK::TeXFont_PK( tqparent=" << tqparent << ")" << endl;
+  kdDebug(4300) << "TeXFont_PK::TeXFont_PK( parent=" << parent << ")" << endl;
 #endif
 
   for(unsigned int i=0; i<TeXFontDefinition::max_num_of_chars_in_font; i++)
     characterBitmaps[i] = 0;
-  file = fopen(TQFile::encodeName(tqparent->filename), "r");
+  file = fopen(TQFile::encodeName(parent->filename), "r");
   if (file == 0) 
-    kdError(4300) << i18n("Cannot open font file %1.").tqarg(tqparent->filename) << endl;
+    kdError(4300) << i18n("Cannot open font file %1.").tqarg(parent->filename) << endl;
 #ifdef DEBUG_PK
   else
     kdDebug(4300) << "TeXFont_PK::TeXFont_PK(): file opened successfully" << endl;
@@ -136,7 +136,7 @@ glyph* TeXFont_PK::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const TQ
     // If the character is not defined in the PK file, mark the
     // character as missing, and print an error message
     if (g->addr == 0) {
-      kdError(4300) << i18n("TexFont_PK::operator[]: Character %1 not defined in font %2").tqarg(ch).tqarg(tqparent->filename) << endl;
+      kdError(4300) << i18n("TexFont_PK::operator[]: Character %1 not defined in font %2").tqarg(ch).tqarg(parent->filename) << endl;
       g->addr = -1;
       return g;
     }
@@ -163,7 +163,7 @@ glyph* TeXFont_PK::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const TQ
       ((g->shrunkenCharacter.isNull()) || (color != g->color)) &&
       (characterBitmaps[ch]->w != 0)) {
     g->color = color;
-    double shrinkFactor = 1200 / tqparent->displayResolution_in_dpi;
+    double shrinkFactor = 1200 / parent->displayResolution_in_dpi;
     
     // All is fine? Then we rescale the bitmap in order to produce the
     // required pixmap.  Rescaling a character, however, is an art
@@ -270,7 +270,7 @@ glyph* TeXFont_PK::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const TQ
     im32.setAlphaBuffer(true);
     // Do TQPixmaps fully support the alpha channel? If yes, we use
     // that. Otherwise, use other routines as a fallback
-    if (tqparent->font_pool->TQPixmapSupportsAlpha) {
+    if (parent->font_pool->TQPixmapSupportsAlpha) {
       // If the alpha channel is properly supported, we set the
       // character glyph to a colored rectangle, and define the
       // character outline only using the alpha channel. That ensures
@@ -283,7 +283,7 @@ glyph* TeXFont_PK::getGlyph(TQ_UINT16 ch, bool generateCharacterPixmap, const TQ
       }
     } else {
       // If the alpha channel is not supported... QT seems to turn the
-      // alpha channel into a crude bitmap which is used to tqmask the
+      // alpha channel into a crude bitmap which is used to mask the
       // resulting TQPixmap. In this case, we define the character
       // outline using the image data, and use the alpha channel only
       // to store "maximally opaque" or "completely transparent"
@@ -454,7 +454,7 @@ void TeXFont_PK::PK_skip_specials()
       case PK_NOOP :
 	break;
       default :
-	oops(i18n("Unexpected %1 in PK file %2").tqarg(PK_flag_byte).tqarg(tqparent->filename) );
+	oops(i18n("Unexpected %1 in PK file %2").tqarg(PK_flag_byte).tqarg(parent->filename) );
 	break;
       }
     }
@@ -521,7 +521,7 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
     w = num(fp, n);
     h = num(fp, n);
     if (w > 0x7fff || h > 0x7fff)
-      oops(i18n("The character %1 is too large in file %2").tqarg(ch).tqarg(tqparent->filename));
+      oops(i18n("The character %1 is too large in file %2").tqarg(ch).tqarg(parent->filename));
     characterBitmaps[ch]->w = w;
     characterBitmaps[ch]->h = h;
   }
@@ -626,9 +626,9 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
 	paint_switch = 1 - paint_switch;
       }
       if (cp != ((TQ_UINT32 *) (characterBitmaps[ch]->bits + bytes_wide * characterBitmaps[ch]->h)))
-	oops(i18n("Wrong number of bits stored:  char. %1, font %2").tqarg(ch).tqarg(tqparent->filename));
+	oops(i18n("Wrong number of bits stored:  char. %1, font %2").tqarg(ch).tqarg(parent->filename));
       if (rows_left != 0 || h_bit != characterBitmaps[ch]->w)
-	oops(i18n("Bad pk file (%1), too many bits").tqarg(tqparent->filename));
+	oops(i18n("Bad pk file (%1), too many bits").tqarg(parent->filename));
     }
     
     // The data in the bitmap is now in the processor's bit order,
@@ -712,9 +712,9 @@ void TeXFont_PK::read_PK_char(unsigned int ch)
 	paint_switch = 1 - paint_switch;
       }
       if (cp != ((TQ_UINT32 *) (characterBitmaps[ch]->bits + bytes_wide * characterBitmaps[ch]->h)))
-	oops(i18n("Wrong number of bits stored:  char. %1, font %2").tqarg(ch).tqarg(tqparent->filename));
+	oops(i18n("Wrong number of bits stored:  char. %1, font %2").tqarg(ch).tqarg(parent->filename));
       if (rows_left != 0 || h_bit != characterBitmaps[ch]->w)
-	oops(i18n("Bad pk file (%1), too many bits").tqarg(tqparent->filename));
+	oops(i18n("Bad pk file (%1), too many bits").tqarg(parent->filename));
     }
   } // endif: big or small Endian?
 }

kdvi/TeXFont_PK.h

@@ -9,7 +9,7 @@ class glyph;
 
 class TeXFont_PK : public TeXFont {
  public:
-  TeXFont_PK(TeXFontDefinition *tqparent);
+  TeXFont_PK(TeXFontDefinition *parent);
   ~TeXFont_PK();
   
   glyph* getGlyph(TQ_UINT16 character, bool generateCharacterPixmap=false, const TQColor& color=TQt::black);

kdvi/TeXFont_TFM.cpp

@@ -21,14 +21,14 @@
 //#define DEBUG_TFM
 
 
-TeXFont_TFM::TeXFont_TFM(TeXFontDefinition *tqparent) 
+TeXFont_TFM::TeXFont_TFM(TeXFontDefinition *parent) 
-  : TeXFont(tqparent)
+  : TeXFont(parent)
 {
 #ifdef DEBUG_TFM
-  kdDebug(4300) << "TeXFont_TFM::TeXFont_TFM( tqparent=" << tqparent << " )" << endl;
+  kdDebug(4300) << "TeXFont_TFM::TeXFont_TFM( parent=" << parent << " )" << endl;
 #endif
 
-  TQFile file( tqparent->filename );
+  TQFile file( parent->filename );
   if ( !file.open( IO_ReadOnly ) ) {
     kdError(4300) << "TeXFont_TFM::TeXFont_TFM(): Could not read TFM file" << endl;
     return;
@@ -49,7 +49,7 @@ TeXFont_TFM::TeXFont_TFM(TeXFontDefinition *tqparent)
 		<< "nd= " << nd << endl;
 #endif
   if ((bc > ec) || (ec >= TeXFontDefinition::max_num_of_chars_in_font)) {
-    kdError(4300) << "TeXFont_TFM::TeXFont_TFM( filename=" << tqparent->filename << " ): The font has an invalid bc and ec entries." << endl;
+    kdError(4300) << "TeXFont_TFM::TeXFont_TFM( filename=" << parent->filename << " ): The font has an invalid bc and ec entries." << endl;
     file.close();
     return;
   }
@@ -97,7 +97,7 @@ TeXFont_TFM::TeXFont_TFM(TeXFontDefinition *tqparent)
     TQ_UINT8 byte;
     stream >> byte;
     if (byte >= nw) 
-      kdError(4300) << "TeXFont_TFM::TeXFont_TFM( filename=" << tqparent->filename << " ): The font has an invalid Char-Info table." << endl;
+      kdError(4300) << "TeXFont_TFM::TeXFont_TFM( filename=" << parent->filename << " ): The font has an invalid Char-Info table." << endl;
     else {
       characterWidth_in_units_of_design_size[characterCode] = widthTable_in_units_of_design_size[byte];
       g->dvi_advance_in_units_of_design_size_by_2e20 = widthTable_in_units_of_design_size[byte].value;
@@ -106,7 +106,7 @@ TeXFont_TFM::TeXFont_TFM(TeXFontDefinition *tqparent)
     stream >> byte;
     byte = byte >> 4;
     if (byte >= nh)
-      kdError(4300) << "TeXFont_TFM::TeXFont_TFM( filename=" << tqparent->filename << " ): The font has an invalid Char-Info table." << endl;
+      kdError(4300) << "TeXFont_TFM::TeXFont_TFM( filename=" << parent->filename << " ): The font has an invalid Char-Info table." << endl;
     else 
       characterHeight_in_units_of_design_size[characterCode] = heightTable_in_units_of_design_size[byte];
     
@@ -139,10 +139,10 @@ glyph *TeXFont_TFM::getGlyph(TQ_UINT16 characterCode, bool generateCharacterPixm
   
   if ((generateCharacterPixmap == true) && ((g->shrunkenCharacter.isNull()) || (color != g->color)) ) {
     g->color = color;
-    TQ_UINT16 pixelWidth = (TQ_UINT16)(tqparent->displayResolution_in_dpi *
+    TQ_UINT16 pixelWidth = (TQ_UINT16)(parent->displayResolution_in_dpi *
 				     design_size_in_TeX_points.toDouble() *
 				     characterWidth_in_units_of_design_size[characterCode].toDouble() * 100.0/7227.0 + 0.5);
-    TQ_UINT16 pixelHeight = (TQ_UINT16)(tqparent->displayResolution_in_dpi *
+    TQ_UINT16 pixelHeight = (TQ_UINT16)(parent->displayResolution_in_dpi *
 				      design_size_in_TeX_points.toDouble() *
 				      characterHeight_in_units_of_design_size[characterCode].toDouble() * 100.0/7227.0 + 0.5);
     

kdvi/TeXFont_TFM.h

@@ -23,7 +23,7 @@ class fix_word {
 
 class TeXFont_TFM : public TeXFont {
  public:
-  TeXFont_TFM(TeXFontDefinition *tqparent);
+  TeXFont_TFM(TeXFontDefinition *parent);
   ~TeXFont_TFM();
   
   glyph* getGlyph(TQ_UINT16 character, bool generateCharacterPixmap=false, const TQColor& color=TQt::black);

kdvi/dviRenderer.cpp

@@ -71,7 +71,7 @@ dviRenderer::dviRenderer(TQWidget *par)
   : DocumentRenderer(par), info(new infoDialog(par))
 {
 #ifdef DEBUG_DVIRENDERER
-  kdDebug(4300) << "dviRenderer( tqparent=" << par << " )" << endl;
+  kdDebug(4300) << "dviRenderer( parent=" << par << " )" << endl;
 #endif
 
   // initialize the dvi machinery

kdvi/dviRenderer.h

@@ -88,7 +88,7 @@ class dviRenderer : public DocumentRenderer, bigEndianByteReader
   TQ_OBJECT
 
 public:
-  dviRenderer(TQWidget *tqparent);
+  dviRenderer(TQWidget *parent);
   ~dviRenderer();
 
   virtual bool	setFile(const TQString &fname, const KURL &base);

kdvi/dviWidget.cpp

@@ -22,8 +22,8 @@
 #include "renderedDviPagePixmap.h"
 #include "selection.h"
 
-DVIWidget::DVIWidget(TQWidget* tqparent, PageView* sv, DocumentPageCache* cache, const char* name)
+DVIWidget::DVIWidget(TQWidget* parent, PageView* sv, DocumentPageCache* cache, const char* name)
-  : DocumentWidget(tqparent, sv, cache, name)
+  : DocumentWidget(parent, sv, cache, name)
 {
 }
 
@@ -74,7 +74,7 @@ void DVIWidget::mousePressEvent(TQMouseEvent* e)
     e->accept();
   }
 
-  // Call implementation from tqparent
+  // Call implementation from parent
   DocumentWidget::mousePressEvent(e);
 }
 

kdvi/dviWidget.h

@@ -26,7 +26,7 @@ class DVIWidget : public DocumentWidget
   TQ_OBJECT
 
 public: 
-  DVIWidget(TQWidget* tqparent, PageView* sv, DocumentPageCache* cache, const char* name);
+  DVIWidget(TQWidget* parent, PageView* sv, DocumentPageCache* cache, const char* name);
 
 signals:
   void SRCLink(const TQString&, TQMouseEvent* e, DocumentWidget*);

kdvi/fontprogress.cpp

@@ -22,11 +22,11 @@
 #include <tqvbox.h>
 
 /* 
- *  Constructs a fontProgressDialog which is a child of 'tqparent', with the 
+ *  Constructs a fontProgressDialog which is a child of 'parent', with the 
  *  name 'name' and widget flags set to 'f' 
  */
-fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString& label, const TQString& abortTip, const TQString& whatsThis, const TQString& ttip, TQWidget* tqparent, const TQString& name, bool progressbar)
+fontProgressDialog::fontProgressDialog(const TQString& helpIndex, const TQString& label, const TQString& abortTip, const TQString& whatsThis, const TQString& ttip, TQWidget* parent, const TQString& name, bool progressbar)
-  : KDialogBase( tqparent, "Font Generation Progress Dialog", true, name, Cancel, Cancel, true )
+  : KDialogBase( parent, "Font Generation Progress Dialog", true, name, Cancel, Cancel, true )
 {
   setCursor( TQCursor( 3 ) );
 

kdvi/fontprogress.h

@@ -35,7 +35,7 @@ class fontProgressDialog : public KDialogBase
 
 public:
     fontProgressDialog( const TQString& helpIndex, const TQString& label, const TQString& abortTip, const TQString& whatsThis, const TQString& ttip,
-			TQWidget* tqparent = 0, const TQString &name = 0, bool progressbar=true );
+			TQWidget* parent = 0, const TQString &name = 0, bool progressbar=true );
     ~fontProgressDialog();
     
     /** The number of steps already done is increased, the text received

kdvi/infodialog.cpp

@@ -21,8 +21,8 @@
 #include "fontpool.h"
 #include "infodialog.h"
 
-infoDialog::infoDialog( TQWidget* tqparent )
+infoDialog::infoDialog( TQWidget* parent )
-  : KDialogBase( Tabbed, i18n("Document Info"), Ok, Ok, tqparent, "Document Info", false, false)
+  : KDialogBase( Tabbed, i18n("Document Info"), Ok, Ok, parent, "Document Info", false, false)
 {
   TQFrame *page1 = addPage( i18n("DVI File") );
   TQVBoxLayout *topLayout1 = new TQVBoxLayout( page1, 0, 6 );

kdvi/infodialog.h

@@ -23,7 +23,7 @@ class infoDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-    infoDialog( TQWidget* tqparent = 0 );
+    infoDialog( TQWidget* parent = 0 );
 
     /** This method is used to set the data coming from the DVI
         file. Note that 0 is a permissible argument, that just means:

kdvi/kdvi_multipage.cpp

@@ -49,9 +49,9 @@ K_EXPORT_COMPONENT_FACTORY(kdvipart, KDVIMultiPageFactory)
 
 
 
-KDVIMultiPage::KDVIMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
+KDVIMultiPage::KDVIMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
                              const char *name, const TQStringList& args)
-  : KMultiPage(parentWidget, widgetName, tqparent, name), DVIRenderer(parentWidget)
+  : KMultiPage(parentWidget, widgetName, parent, name), DVIRenderer(parentWidget)
 {
   Q_UNUSED(args);
 #ifdef PERFORMANCE_MEASUREMENT
@@ -213,7 +213,7 @@ void KDVIMultiPage::addConfigDialogs(KConfigDialog* configDialog)
 
 void KDVIMultiPage::preferencesChanged()
 {
-  // Call method from tqparent class
+  // Call method from parent class
   KMultiPage::preferencesChanged();
 #ifdef  KDVI_MULTIPAGE_DEBUG
   kdDebug(4300) << "preferencesChanged" << endl;

kdvi/kdvi_multipage.h

@@ -15,7 +15,7 @@ class KDVIMultiPage : public KMultiPage
   TQ_OBJECT
 
 public:
-  KDVIMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
+  KDVIMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
                 const char *name, const TQStringList& args = TQStringList());
   virtual ~KDVIMultiPage();
 

kdvi/optionDialogFontsWidget.cpp

@@ -21,10 +21,10 @@
 #include "optionDialogFontsWidget.h"
 
 
-// Constructs a optionDialogWidget_base which is a child of 'tqparent', with
+// Constructs a optionDialogWidget_base which is a child of 'parent', with
 // the name 'name' and widget flags set to 'f'.
-optionDialogFontsWidget::optionDialogFontsWidget( TQWidget* tqparent,  const char* name, WFlags fl )
+optionDialogFontsWidget::optionDialogFontsWidget( TQWidget* parent,  const char* name, WFlags fl )
-    : optionDialogFontsWidget_base( tqparent,  name, fl )
+    : optionDialogFontsWidget_base( parent,  name, fl )
 {
 #ifndef HAVE_FREETYPE
   kcfg_UseType1Fonts->setChecked(false);

kdvi/optionDialogFontsWidget.h

@@ -18,7 +18,7 @@ class optionDialogFontsWidget : public optionDialogFontsWidget_base
   TQ_OBJECT
     
  public:
-  optionDialogFontsWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+  optionDialogFontsWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
   ~optionDialogFontsWidget();
 };
 

kdvi/optionDialogSpecialWidget.cpp

@@ -23,10 +23,10 @@
 #include "prefs.h"
 
 
-// Constructs a optionDialogWidget_base which is a child of 'tqparent', with
+// Constructs a optionDialogWidget_base which is a child of 'parent', with
 // the name 'name' and widget flags set to 'f'.
-optionDialogSpecialWidget::optionDialogSpecialWidget( TQWidget* tqparent,  const char* name, WFlags fl )
+optionDialogSpecialWidget::optionDialogSpecialWidget( TQWidget* parent,  const char* name, WFlags fl )
-    : optionDialogSpecialWidget_base( tqparent,  name, fl )
+    : optionDialogSpecialWidget_base( parent,  name, fl )
 {
   // Set up the list of known and supported editors
   editorNameString        += i18n("User-Defined Editor");

kdvi/optionDialogSpecialWidget.h

@@ -18,7 +18,7 @@ class optionDialogSpecialWidget : public optionDialogSpecialWidget_base
   TQ_OBJECT
     
  public:
-  optionDialogSpecialWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 );
+  optionDialogSpecialWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 );
   ~optionDialogSpecialWidget();
   
  public slots:

kdvi/psheader.txt

@@ -21,7 +21,7 @@ B/Cdx{Cd A length 1 sub get}B/Ci{Cd A type/stringtype ne{ctr get/ctr ctr
 1 roll S A/base get 2 index get S/BitMaps get S get/Cd X pop/ctr 0 N Cdx
 0 Cx Cy Ch sub Cx Cw add Cy setcachedevice Cw Ch true[1 0 0 -1 -.1 Cx
 sub Cy .1 sub]/id Ci N/rw Cw 7 add 8 idiv string N/rc 0 N/gp 0 N/cp 0 N{
-rc 0 ne{rc 1 sub/rc X rw}{G}ifelse}imagetqmask restore}B/G{{id gp get/gp
+rc 0 ne{rc 1 sub/rc X rw}{G}ifelse}imagemask restore}B/G{{id gp get/gp
 gp 1 add N A 18 mod S 18 idiv pl S get exec}loop}B/adv{cp add/cp X}B
 /chg{rw cp id gp 4 index getinterval putinterval A gp add/gp X adv}B/nd{
 /cp 0 N rw exit}B/lsh{rw cp 2 copy get A 0 eq{pop 1}{A 255 eq{pop 254}{
@@ -45,9 +45,9 @@ index cvrs cvn put}for pop 65781.76 div/vsize X 65781.76 div/hsize X}N
 /Ry X/Rx X V}B statusdict begin/product where{pop false[(Display)(NeXT)
 (LaserWriter 16/600)]{A length product length le{A length product exch 0
 exch getinterval eq{pop true exit}if}{pop}ifelse}forall}{false}ifelse
-end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{BDot}imagetqmask
+end{{gsave TR -.1 .1 TR 1 1 scale Rx Ry false RMat{BDot}imagemask
 grestore}}{{gsave TR -.1 .1 TR Rx Ry scale 1 1 false RMat{BDot}
-imagetqmask grestore}}ifelse B/QV{gsave newpath transform round exch round
+imagemask grestore}}ifelse B/QV{gsave newpath transform round exch round
 exch itransform moveto Rx 0 rlineto 0 Ry neg rlineto Rx neg 0 rlineto
 fill grestore}B/a{moveto}B/delta 0 N/tail{A/delta X 0 rmoveto}B/M{S p
 delta add tail}B/b{S p tail}B/c{-4 M}B/d{-3 M}B/e{-2 M}B/f{-1 M}B/g{0 M}

kfax/kfax.h

@@ -59,7 +59,7 @@ class TopLevel : public KMainWindow
 
 public:
 
-    TopLevel( TQWidget *tqparent=0, const char *name=0 );
+    TopLevel( TQWidget *parent=0, const char *name=0 );
     ~TopLevel();
 
     void openNetFile( const KURL& _url);

kfax/kfax_printsettings.cpp

@@ -24,8 +24,8 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-KFAXPrintSettings::KFAXPrintSettings(TQWidget *tqparent, const char *name)
+KFAXPrintSettings::KFAXPrintSettings(TQWidget *parent, const char *name)
-: KPrintDialogPage(tqparent, name)
+: KPrintDialogPage(parent, name)
 {
 	TQString whatsThisScaleFullPage = i18n( "<qt>"
 		"<p><strong>'Ignore Paper Margins'</strong></p>"

kfax/kfax_printsettings.h

@@ -33,7 +33,7 @@ class KFAXPrintSettings : public KPrintDialogPage
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KFAXPrintSettings(TQWidget *tqparent = 0, const char *name = 0);
+	KFAXPrintSettings(TQWidget *parent = 0, const char *name = 0);
 	~KFAXPrintSettings();
 
 	void getOptions(TQMap<TQString,TQString>& opts, bool incldef = false);

kfax/options.cpp

@@ -48,8 +48,8 @@
 #include "kfax.h"
 #include "options.h"
 
-OptionsDialog::OptionsDialog( TQWidget *tqparent, const char *name)
+OptionsDialog::OptionsDialog( TQWidget *parent, const char *name)
-    : KDialogBase( tqparent, name, true, i18n("Configure"), Ok|Cancel)
+    : KDialogBase( parent, name, true, i18n("Configure"), Ok|Cancel)
 {
   TQWidget *mainWidget = new TQWidget(this);
   setMainWidget(mainWidget);

kfax/options.h

@@ -61,7 +61,7 @@ class OptionsDialog : public KDialogBase {
   TQ_OBJECT
 
 public:
-    OptionsDialog( TQWidget *tqparent = 0, const char *name = 0);
+    OptionsDialog( TQWidget *parent = 0, const char *name = 0);
 
     struct optionsinfo* getInfo();
     void setWidgets(struct optionsinfo *oi);

kfaxview/faxmultipage.cpp

@@ -31,9 +31,9 @@ typedef KParts::GenericFactory<FaxMultiPage> FaxMultiPageFactory;
 K_EXPORT_COMPONENT_FACTORY(kfaxviewpart, FaxMultiPageFactory)
 
 
-FaxMultiPage::FaxMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
+FaxMultiPage::FaxMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
                              const char *name, const TQStringList&)
-  : KMultiPage(parentWidget, widgetName, tqparent, name), faxRenderer(parentWidget)
+  : KMultiPage(parentWidget, widgetName, parent, name), faxRenderer(parentWidget)
 {
   /* This is kparts wizardry that cannot be understood by man. Simply
      change the names to match your implementation.  */

kfaxview/faxmultipage.h

@@ -90,7 +90,7 @@ public:
   kmultipage. Please have a look at the constructor's source code to
   see how to adjust this for your implementation.
   */
-  FaxMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
+  FaxMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *parent,
 		   const char *name, const TQStringList& args = TQStringList());
   
   /** Destructor

kfaxview/faxrenderer.cpp

@@ -36,7 +36,7 @@ FaxRenderer::FaxRenderer(TQWidget* par)
   : DocumentRenderer(par)
 {
 #ifdef KF_DEBUG
-  kdError() << "FaxRenderer( tqparent=" << par << " )" << endl;
+  kdError() << "FaxRenderer( parent=" << par << " )" << endl;
 #endif
 }
 

kfaxview/faxrenderer.h

@@ -47,7 +47,7 @@ public:
        This constructor simply prints a message (if debugging is
        enabled) and calls the default constructor.
    */
-   FaxRenderer(TQWidget* tqparent);
+   FaxRenderer(TQWidget* parent);
 
    /** Destructor
 

kfaxview/libkfaximage/kfaximage.cpp

@@ -38,8 +38,8 @@ static const char FAXMAGIC[]   = "\000PC Research, Inc\000\000\000\000\000\000";
 static const char littleTIFF[] = "\x49\x49\x2a\x00";
 static const char bigTIFF[]    = "\x4d\x4d\x00\x2a";
 
-KFaxImage::KFaxImage( const TQString &filename, TQObject *tqparent, const char *name )
+KFaxImage::KFaxImage( const TQString &filename, TQObject *parent, const char *name )
-   : TQObject(tqparent,name)
+   : TQObject(parent,name)
 {
   KGlobal::locale()->insertCatalogue( TQString::tqfromLatin1("libkfaximage") );
   loadImage(filename);

kfaxview/libkfaximage/kfaximage.h

@@ -64,7 +64,7 @@ public:
      *  @see: numPages
      */
 
-    KFaxImage( const TQString &filename = TQString(), TQObject *tqparent = 0, const char *name = 0 );
+    KFaxImage( const TQString &filename = TQString(), TQObject *parent = 0, const char *name = 0 );
 
     /**
      *  Destructor

kfile-plugins/bmp/kfile_bmp.cpp

@@ -43,10 +43,10 @@ typedef KGenericFactory<KBmpPlugin> BmpFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_bmp, BmpFactory( "kfile_bmp" ))
 
-KBmpPlugin::KBmpPlugin(TQObject *tqparent, const char *name,
+KBmpPlugin::KBmpPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
 
-    : KFilePlugin(tqparent, name, args)
+    : KFilePlugin(parent, name, args)
 {
     KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-bmp" );
 

kfile-plugins/bmp/kfile_bmp.h

@@ -30,7 +30,7 @@ class KBmpPlugin: public KFilePlugin
   TQ_OBJECT
     
 public:
-    KBmpPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
+    KBmpPlugin( TQObject *parent, const char *name, const TQStringList& args );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 };

kfile-plugins/dds/kfile_dds.cpp

@@ -90,10 +90,10 @@ namespace {	// Private.
 		uint flags;
 		uint fourcc;
 		uint bitcount;
-		uint rtqmask;
+		uint rmask;
-		uint gtqmask;
+		uint gmask;
-		uint btqmask;
+		uint bmask;
-		uint atqmask;
+		uint amask;
 	};
 
 	TQDataStream & operator>> ( TQDataStream & s, DDSPixelFormat & pf )
@@ -102,10 +102,10 @@ namespace {	// Private.
 		s >> pf.flags;
 		s >> pf.fourcc;
 		s >> pf.bitcount;
-		s >> pf.rtqmask;
+		s >> pf.rmask;
-		s >> pf.gtqmask;
+		s >> pf.gmask;
-		s >> pf.btqmask;
+		s >> pf.bmask;
-		s >> pf.atqmask;
+		s >> pf.amask;
 		return s;
 	}
 
@@ -182,8 +182,8 @@ namespace {	// Private.
 K_EXPORT_COMPONENT_FACTORY(kfile_dds, DdsFactory( "kfile_dds" ))
 
 // Constructor, init mime type info.
-KDdsPlugin::KDdsPlugin(TQObject *tqparent, const char *name, const TQStringList &args) : 
+KDdsPlugin::KDdsPlugin(TQObject *parent, const char *name, const TQStringList &args) : 
-	KFilePlugin(tqparent, name, args)
+	KFilePlugin(parent, name, args)
 {
     KFileMimeTypeInfo * info = addMimeTypeInfo( "image/x-dds" );
 

kfile-plugins/dds/kfile_dds.h

@@ -30,7 +30,7 @@ class KDdsPlugin: public KFilePlugin
   TQ_OBJECT
     
 public:
-    KDdsPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
+    KDdsPlugin( TQObject *parent, const char *name, const TQStringList& args );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 };

kfile-plugins/dependencies/poppler-tqt/poppler-private.cc

@@ -86,7 +86,7 @@ GooString *TQStringToGooString(const TQString &s)
 }
 
 
-void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * tqparent, GooList * items )
+void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, GooList * items )
 {
     int numItems = items->getLength();
     for ( int i = 0; i < numItems; ++i )
@@ -103,7 +103,7 @@ void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * tqparent,
             continue;
 
         TQDomElement item = docSyn->createElement( name );
-        tqparent->appendChild( item );
+        parent->appendChild( item );
 
         // 2. find the page the link refers to
         ::LinkAction * a = outlineItem->getAction();

kfile-plugins/dependencies/poppler-tqt/poppler-private.h

@@ -84,7 +84,7 @@ class DocumentData {
         return m_outputDev;
     }
 
-    void addTocChildren( TQDomDocument * docSyn, TQDomNode * tqparent, GooList * items );
+    void addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, GooList * items );
 
   class PDFDoc doc;
   bool locked;

kfile-plugins/dvi/kfile_dvi.cpp

@@ -39,8 +39,8 @@
 typedef KGenericFactory<KDviPlugin> DviFactory;
 K_EXPORT_COMPONENT_FACTORY(kfile_dvi, DviFactory("kfile_dvi"))
 
-KDviPlugin::KDviPlugin (TQObject * tqparent, const char * name, const TQStringList & preferredItems)
+KDviPlugin::KDviPlugin (TQObject * parent, const char * name, const TQStringList & preferredItems)
-  : KFilePlugin(tqparent, name, preferredItems)
+  : KFilePlugin(parent, name, preferredItems)
 {
   kdDebug(7034) << "dvi plugin" << endl;
   

kfile-plugins/dvi/kfile_dvi.h

@@ -30,7 +30,7 @@ class KDviPlugin : public KFilePlugin
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KDviPlugin ( TQObject * tqparent, const char * name, const TQStringList & preferredItems );
+	KDviPlugin ( TQObject * parent, const char * name, const TQStringList & preferredItems );
 
 	virtual bool readInfo (KFileMetaInfo & info, uint what);
 };

kfile-plugins/exr/kfile_exr.cpp

@@ -60,9 +60,9 @@ typedef KGenericFactory<KExrPlugin> ExrFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_exr, ExrFactory("kfile_exr"))
 
-KExrPlugin::KExrPlugin(TQObject *tqparent, const char *name,
+KExrPlugin::KExrPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
-    : KFilePlugin(tqparent, name, args)
+    : KFilePlugin(parent, name, args)
 {
     // set up our mime type
     KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-exr" );

kfile-plugins/exr/kfile_exr.h

@@ -32,7 +32,7 @@ class KExrPlugin: public KFilePlugin
   TQ_OBJECT
     
 public:
-    KExrPlugin( TQObject *tqparent, const char *name, const TQStringList& preferredItems );
+    KExrPlugin( TQObject *parent, const char *name, const TQStringList& preferredItems );
 
     virtual bool readInfo( KFileMetaInfo& info, uint );
 };

kfile-plugins/gif/kfile_gif.cpp

@@ -42,9 +42,9 @@ typedef KGenericFactory<KGifPlugin> GifFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_gif, GifFactory("kfile_gif"))
 
-KGifPlugin::KGifPlugin(TQObject *tqparent, const char *name,
+KGifPlugin::KGifPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
-    : KFilePlugin(tqparent, name, args)
+    : KFilePlugin(parent, name, args)
 {
     kdDebug(7034) << "gif KFileMetaInfo plugin\n";
 

kfile-plugins/gif/kfile_gif.h

@@ -30,7 +30,7 @@ class KGifPlugin: public KFilePlugin
   TQ_OBJECT
 
 public:
-    KGifPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
+    KGifPlugin( TQObject *parent, const char *name, const TQStringList& args );
 
     virtual bool readInfo ( KFileMetaInfo& info, uint what );
 };

kfile-plugins/ico/kfile_ico.cpp

@@ -44,10 +44,10 @@ typedef KGenericFactory<KIcoPlugin> IcoFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_ico, IcoFactory( "kfile_ico" ))
 
-KIcoPlugin::KIcoPlugin(TQObject *tqparent, const char *name,
+KIcoPlugin::KIcoPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
 
-    : KFilePlugin(tqparent, name, args)
+    : KFilePlugin(parent, name, args)
 {
     KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-ico" );
 

kfile-plugins/ico/kfile_ico.h

@@ -30,7 +30,7 @@ class KIcoPlugin: public KFilePlugin
   TQ_OBJECT
     
 public:
-    KIcoPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
+    KIcoPlugin( TQObject *parent, const char *name, const TQStringList& args );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 };

kfile-plugins/jpeg/kfile_jpeg.cpp

@@ -44,9 +44,9 @@ typedef KGenericFactory<KJpegPlugin> JpegFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_jpeg, JpegFactory("kfile_jpeg"))
 
-KJpegPlugin::KJpegPlugin(TQObject *tqparent, const char *name,
+KJpegPlugin::KJpegPlugin(TQObject *parent, const char *name,
                        const TQStringList &args )
-    : KFilePlugin(tqparent, name, args)
+    : KFilePlugin(parent, name, args)
 {
   kdDebug(7034) << "jpeg plugin\n";
 
@@ -148,12 +148,12 @@ KJpegPlugin::KJpegPlugin(TQObject *tqparent, const char *name,
 }
 
 TQValidator* KJpegPlugin::createValidator(const KFileMetaInfoItem& /*item*/,
-                                        TQObject */*tqparent*/,
+                                        TQObject */*parent*/,
                                          const char */*name*/ ) const
 {
     // no need to return a validator that validates everything as OK :)
 //     if (item.isEditable())
-//         return new TQRegExpValidator(TQRegExp(".*"), tqparent, name);
+//         return new TQRegExpValidator(TQRegExp(".*"), parent, name);
 //     else
     return 0L;
 }

kfile-plugins/jpeg/kfile_jpeg.h

@@ -29,13 +29,13 @@ class KJpegPlugin: public KFilePlugin
   TQ_OBJECT
 
 public:
-    KJpegPlugin( TQObject *tqparent, const char *name,
+    KJpegPlugin( TQObject *parent, const char *name,
                 const TQStringList& args );
 
     virtual bool readInfo ( KFileMetaInfo& info, uint what );
     virtual bool writeInfo( const KFileMetaInfo& info ) const;
     virtual TQValidator* createValidator( const KFileMetaInfoItem& item,
-                                         TQObject* tqparent, const char* name) const;
+                                         TQObject* parent, const char* name) const;
     
 private:
     TQDateTime parseDateTime( const TQString& string ); 

kfile-plugins/pcx/kfile_pcx.cpp

@@ -56,8 +56,8 @@ TQDataStream &operator>>( TQDataStream &s, PCXHEADER &ph )
   return s;
 }
 
-KPcxPlugin::KPcxPlugin( TQObject *tqparent, const char *name,
+KPcxPlugin::KPcxPlugin( TQObject *parent, const char *name,
-        const TQStringList &args ) : KFilePlugin( tqparent, name, args )
+        const TQStringList &args ) : KFilePlugin( parent, name, args )
 {
   kdDebug(7034) << "PCX file meta info plugin" << endl;
   KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-pcx" );

kfile-plugins/pcx/kfile_pcx.h

@@ -76,7 +76,7 @@ class KPcxPlugin: public KFilePlugin
   TQ_OBJECT
 
 public:
-  KPcxPlugin(TQObject *tqparent, const char *name, const TQStringList& args);
+  KPcxPlugin(TQObject *parent, const char *name, const TQStringList& args);
   virtual bool readInfo(KFileMetaInfo& info, uint what);
 
 private:

kfile-plugins/pdf/kfile_pdf.cpp

@@ -27,8 +27,8 @@ typedef KGenericFactory<KPdfPlugin> PdfFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_pdf, PdfFactory("kfile_pdf"))
 
-KPdfPlugin::KPdfPlugin(TQObject *tqparent, const char *name, const TQStringList &preferredItems)
+KPdfPlugin::KPdfPlugin(TQObject *parent, const char *name, const TQStringList &preferredItems)
-    : KFilePlugin(tqparent, name, preferredItems)
+    : KFilePlugin(parent, name, preferredItems)
 {
     kdDebug(7034) << "pdf plugin\n";
 

kfile-plugins/pdf/kfile_pdf.h

@@ -31,7 +31,7 @@ class KPdfPlugin: public KFilePlugin
 Q_OBJECT
   TQ_OBJECT
 public:
-    KPdfPlugin( TQObject *tqparent, const char *name, const TQStringList& preferredItems );
+    KPdfPlugin( TQObject *parent, const char *name, const TQStringList& preferredItems );
 
     virtual bool readInfo(KFileMetaInfo& info, uint what);
 };

kfile-plugins/png/kfile_png.cpp

@@ -87,9 +87,9 @@ typedef KGenericFactory<KPngPlugin> PngFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_png, PngFactory("kfile_png"))
 
-KPngPlugin::KPngPlugin(TQObject *tqparent, const char *name,
+KPngPlugin::KPngPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
-    : KFilePlugin(tqparent, name, args)
+    : KFilePlugin(parent, name, args)
 {
     kdDebug(7034) << "png plugin\n";
 

kfile-plugins/png/kfile_png.h

@@ -32,7 +32,7 @@ class KPngPlugin: public KFilePlugin
   TQ_OBJECT
     
 public:
-    KPngPlugin( TQObject *tqparent, const char *name, const TQStringList& preferredItems );
+    KPngPlugin( TQObject *parent, const char *name, const TQStringList& preferredItems );
 
     virtual bool readInfo( KFileMetaInfo& info, uint );
 };

kfile-plugins/pnm/kfile_pnm.cpp

@@ -33,7 +33,7 @@ typedef KGenericFactory<KPnmPlugin> PnmFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_pnm, PnmFactory("kfile_pnm"))
 
-KPnmPlugin::KPnmPlugin(TQObject *tqparent, const char *name, const TQStringList &args) : KFilePlugin(tqparent, name, args) 
+KPnmPlugin::KPnmPlugin(TQObject *parent, const char *name, const TQStringList &args) : KFilePlugin(parent, name, args) 
 {
 	makeMimeTypeInfo( "image/x-portable-bitmap" );
 	makeMimeTypeInfo( "image/x-portable-greymap" );

kfile-plugins/pnm/kfile_pnm.h

@@ -30,7 +30,7 @@ class KPnmPlugin: public KFilePlugin
   TQ_OBJECT
     
 public:
-	KPnmPlugin( TQObject *tqparent, const char *name, const TQStringList& preferredItems );
+	KPnmPlugin( TQObject *parent, const char *name, const TQStringList& preferredItems );
 	virtual bool readInfo( KFileMetaInfo& info, uint );
 
 private:

kfile-plugins/ps/kfile_ps.cpp

@@ -30,9 +30,9 @@ typedef KGenericFactory<KPSPlugin> PSFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_ps, PSFactory("kfile_ps"))
 
-KPSPlugin::KPSPlugin(TQObject *tqparent, const char *name,
+KPSPlugin::KPSPlugin(TQObject *parent, const char *name,
                        const TQStringList &preferredItems) : 
-    KFilePlugin( tqparent, name, preferredItems )
+    KFilePlugin( parent, name, preferredItems )
 {
     kdDebug(7034) << "ps plugin\n";
     

kfile-plugins/ps/kfile_ps.h

@@ -32,7 +32,7 @@ class KPSPlugin: public KFilePlugin, public KDSCCommentHandler
     Q_OBJECT
   TQ_OBJECT
 public:
-    KPSPlugin( TQObject *tqparent, const char *name,
+    KPSPlugin( TQObject *parent, const char *name,
                 const TQStringList& preferredItems );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);

kfile-plugins/raw/kcamerarawplugin.cpp

@@ -83,9 +83,9 @@ bool KCameraRawPlugin::createPreview(const TQString &path, TQImage &img)
   return true;	
 }
 
-KCameraRawPlugin::KCameraRawPlugin(TQObject *tqparent, const char *name,
+KCameraRawPlugin::KCameraRawPlugin(TQObject *parent, const char *name,
 				   const TQStringList &args )
-    : KFilePlugin(tqparent, name, args)
+    : KFilePlugin(parent, name, args)
 {
   kdDebug(7034) << "KCameraRawPlugin c'tor" << endl;
 

kfile-plugins/raw/kcamerarawplugin.h

@@ -29,7 +29,7 @@ class KCameraRawPlugin: public KFilePlugin {
   TQ_OBJECT
 
 public:
-    KCameraRawPlugin(TQObject *tqparent, const char *name, const TQStringList& args);
+    KCameraRawPlugin(TQObject *parent, const char *name, const TQStringList& args);
     virtual bool readInfo(KFileMetaInfo& info, uint what);
 
 private:

kfile-plugins/rgb/kfile_rgb.cpp

@@ -32,8 +32,8 @@ typedef KGenericFactory<KRgbPlugin> RgbFactory;
 K_EXPORT_COMPONENT_FACTORY(kfile_rgb, RgbFactory("kfile_rgb"))
 
 
-KRgbPlugin::KRgbPlugin(TQObject *tqparent, const char *name, const TQStringList &args) :
+KRgbPlugin::KRgbPlugin(TQObject *parent, const char *name, const TQStringList &args) :
-	KFilePlugin(tqparent, name, args)
+	KFilePlugin(parent, name, args)
 {
 	KFileMimeTypeInfo* info = addMimeTypeInfo("image/x-rgb");
 
@@ -199,9 +199,9 @@ bool KRgbPlugin::writeInfo(const KFileMetaInfo& info) const
 
 // restrict to 79 ASCII characters
 TQValidator* KRgbPlugin::createValidator(const TQString&, const TQString &,
-		const TQString &, TQObject* tqparent, const char* name) const
+		const TQString &, TQObject* parent, const char* name) const
 {
-	return new TQRegExpValidator(TQRegExp("[\x0020-\x007E]{79}"), tqparent, name);
+	return new TQRegExpValidator(TQRegExp("[\x0020-\x007E]{79}"), parent, name);
 }
 
 

kfile-plugins/rgb/kfile_rgb.h

@@ -30,12 +30,12 @@ class KRgbPlugin : public KFilePlugin
   TQ_OBJECT
 
 public:
-	KRgbPlugin(TQObject *tqparent, const char *name, const TQStringList& args);
+	KRgbPlugin(TQObject *parent, const char *name, const TQStringList& args);
 	virtual bool readInfo(KFileMetaInfo& info, uint what);
 	virtual bool writeInfo(const KFileMetaInfo& info) const;
 	virtual TQValidator* createValidator(const TQString& mimetype,
 			const TQString &group, const TQString &key,
-			TQObject* tqparent, const char* name) const;
+			TQObject* parent, const char* name) const;
 
 };
 

kfile-plugins/tga/kfile_tga.cpp

@@ -44,10 +44,10 @@ typedef KGenericFactory<KTgaPlugin> TgaFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_tga, TgaFactory( "kfile_tga" ))
 
-KTgaPlugin::KTgaPlugin(TQObject *tqparent, const char *name,
+KTgaPlugin::KTgaPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
 
-    : KFilePlugin(tqparent, name, args)
+    : KFilePlugin(parent, name, args)
 {
     KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-targa" );
 

kfile-plugins/tga/kfile_tga.h

@@ -30,7 +30,7 @@ class KTgaPlugin: public KFilePlugin
   TQ_OBJECT
     
 public:
-    KTgaPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
+    KTgaPlugin( TQObject *parent, const char *name, const TQStringList& args );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 };

kfile-plugins/tiff/kfile_tiff.cpp

@@ -34,8 +34,8 @@ typedef KGenericFactory<KTiffPlugin> TiffFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_tiff, TiffFactory("kfile_tiff"))
 
-KTiffPlugin::KTiffPlugin(TQObject *tqparent, const char *name,
+KTiffPlugin::KTiffPlugin(TQObject *parent, const char *name,
-        const TQStringList &args) : KFilePlugin(tqparent, name, args)
+        const TQStringList &args) : KFilePlugin(parent, name, args)
 {
     kdDebug(7034) << "TIFF file meta info plugin" << endl;
     KFileMimeTypeInfo* info = addMimeTypeInfo( "image/tiff" );
@@ -90,7 +90,7 @@ KTiffPlugin::KTiffPlugin(TQObject *tqparent, const char *name,
     m_colorMode.insert(PHOTOMETRIC_PALETTE,
                 new TQString(I18N_NOOP("Palette color")));
     m_colorMode.insert(PHOTOMETRIC_MASK,
-                new TQString(I18N_NOOP("Transparency tqmask")));
+                new TQString(I18N_NOOP("Transparency mask")));
     m_colorMode.insert(PHOTOMETRIC_SEPARATED,
                 new TQString(I18N_NOOP("Color separations")));
     m_colorMode.insert(PHOTOMETRIC_YCBCR,

kfile-plugins/tiff/kfile_tiff.h

@@ -30,7 +30,7 @@ class KTiffPlugin: public KFilePlugin
   TQ_OBJECT
 
 public:
-    KTiffPlugin(TQObject *tqparent, const char *name, const TQStringList& args);
+    KTiffPlugin(TQObject *parent, const char *name, const TQStringList& args);
     virtual bool readInfo(KFileMetaInfo& info, uint what);
 
 private:

kfile-plugins/xbm/kfile_xbm.cpp

@@ -42,10 +42,10 @@ typedef KGenericFactory<KXbmPlugin> XbmFactory;
 
 K_EXPORT_COMPONENT_FACTORY(kfile_xbm, XbmFactory( "kfile_xbm" ))
 
-KXbmPlugin::KXbmPlugin(TQObject *tqparent, const char *name,
+KXbmPlugin::KXbmPlugin(TQObject *parent, const char *name,
                        const TQStringList &args)
 
-    : KFilePlugin(tqparent, name, args)
+    : KFilePlugin(parent, name, args)
 {
     KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-xbm" );
 

kfile-plugins/xbm/kfile_xbm.h

@@ -30,7 +30,7 @@ class KXbmPlugin: public KFilePlugin
   TQ_OBJECT
     
 public:
-    KXbmPlugin( TQObject *tqparent, const char *name, const TQStringList& args );
+    KXbmPlugin( TQObject *parent, const char *name, const TQStringList& args );
     
     virtual bool readInfo( KFileMetaInfo& info, uint what);
     

kfile-plugins/xpm/kfile_xpm.cpp

@@ -32,8 +32,8 @@ K_EXPORT_COMPONENT_FACTORY(kfile_xpm, xpmFactory( "kfile_xpm" ))
 
 //--------------------------------------------------------------------------------
 
-xpmPlugin::xpmPlugin(TQObject *tqparent, const char *name, const TQStringList &args)
+xpmPlugin::xpmPlugin(TQObject *parent, const char *name, const TQStringList &args)
-  : KFilePlugin(tqparent, name, args)
+  : KFilePlugin(parent, name, args)
 {
   KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-xpm" );
 

kfile-plugins/xpm/kfile_xpm.h

@@ -37,7 +37,7 @@ class xpmPlugin: public KFilePlugin
   TQ_OBJECT
 
   public:
-    xpmPlugin(TQObject *tqparent, const char *name, const TQStringList& args);
+    xpmPlugin(TQObject *parent, const char *name, const TQStringList& args);
 
     virtual bool readInfo(KFileMetaInfo& info, uint what);
 };

kgamma/kcmkgamma/displaynumber.cpp

@@ -20,8 +20,8 @@
 
 #include "displaynumber.h"
 
-DisplayNumber::DisplayNumber(TQWidget *tqparent, int digits, \
+DisplayNumber::DisplayNumber(TQWidget *parent, int digits, \
-    int prec, const char *name) : TQLabel(tqparent,name) {
+    int prec, const char *name) : TQLabel(parent,name) {
 
   setPrecision(prec);
   setWidth(digits);  

kgamma/kcmkgamma/displaynumber.h

@@ -28,7 +28,7 @@ class DisplayNumber : public TQLabel  {
    Q_OBJECT
   TQ_OBJECT
 public: 
-  DisplayNumber(TQWidget *tqparent=0, int digits=0, int prec=0, const char *name=0);
+  DisplayNumber(TQWidget *parent=0, int digits=0, int prec=0, const char *name=0);
   ~DisplayNumber();
   void setFont( const TQFont & f );
   void setNum(double num);

kgamma/kcmkgamma/gammactrl.cpp

@@ -26,9 +26,9 @@
 #include "displaynumber.h"
 #include "gammactrl.moc"
 
-GammaCtrl::GammaCtrl(TQWidget *tqparent, XVidExtWrap *xvid, int channel, \
+GammaCtrl::GammaCtrl(TQWidget *parent, XVidExtWrap *xvid, int channel, \
   const TQString& mingamma, const TQString& maxgamma, const TQString& setgamma, \
-  const char *name) : TQHBox(tqparent, name)
+  const char *name) : TQHBox(parent, name)
 {
   int maxslider = (int)( ( maxgamma.toDouble() - mingamma.toDouble() \
                   + 0.0005 ) * 20 );

kgamma/kcmkgamma/gammactrl.h

@@ -34,7 +34,7 @@ class GammaCtrl : public TQHBox  {
   TQ_OBJECT
   public:
     /** construktor */
-    GammaCtrl(TQWidget *tqparent=0, XVidExtWrap *xvid=0, int channel=0, \
+    GammaCtrl(TQWidget *parent=0, XVidExtWrap *xvid=0, int channel=0, \
       const TQString& mingamma="0.40", const TQString& maxgamma="3.50", \
       const TQString& setgamma="1.00", const char *name=0 );
     /** destruktor */

kgamma/kcmkgamma/kgamma.cpp

@@ -55,8 +55,8 @@ extern "C"
 	}
 }
 
-KGamma::KGamma(TQWidget *tqparent, const char *name, const TQStringList&)
+KGamma::KGamma(TQWidget *parent, const char *name, const TQStringList&)
-    :KCModule(tqparent,name)
+    :KCModule(parent,name)
 {
   bool ok;
   GammaCorrection = true;

kgamma/kcmkgamma/kgamma.h

@@ -30,7 +30,7 @@ class KGamma: public KCModule
    Q_OBJECT
   TQ_OBJECT
    public:
-      KGamma(TQWidget *tqparent, const char *name, const TQStringList&);
+      KGamma(TQWidget *parent, const char *name, const TQStringList&);
       virtual ~KGamma();
 
       void load();

kghostview/fullscreenfilter.cpp

@@ -22,16 +22,16 @@
 #include "kgv_miniwidget.h"
 #include "kgvpageview.h"
 
-FullScreenFilter::FullScreenFilter( KGVShell& tqparent )
+FullScreenFilter::FullScreenFilter( KGVShell& parent )
-	:TQObject( &tqparent, "full-screen-filter" ),
+	:TQObject( &parent, "full-screen-filter" ),
-	 tqparent( tqparent )
+	 parent( parent )
 {
 }
 
 bool FullScreenFilter::eventFilter( TQObject* /*object*/, TQEvent* ev) {
 	if ( TQKeyEvent* keyevent = dynamic_cast<TQKeyEvent*>( ev ) ) {
 		if ( keyevent->key() == Key_Escape ) {
-			tqparent.setFullScreen( false );
+			parent.setFullScreen( false );
 			keyevent->accept();
 			return true;
 		}
@@ -39,9 +39,9 @@ bool FullScreenFilter::eventFilter( TQObject* /*object*/, TQEvent* ev) {
 	if ( TQMouseEvent* mouseevent = dynamic_cast<TQMouseEvent*>( ev ) ) {
 		if ( mouseevent->stateAfter() & mouseevent->button() & Qt::LeftButton ) {
 			// if ( The whole image is visible at once )
-			if ( tqparent.m_gvpart->pageView()->contentsHeight() <= tqparent.m_gvpart->widget()->height() &&
+			if ( parent.m_gvpart->pageView()->contentsHeight() <= parent.m_gvpart->widget()->height() &&
-			     tqparent.m_gvpart->pageView()->contentsWidth() <= tqparent.m_gvpart->widget()->width() ) {
+			     parent.m_gvpart->pageView()->contentsWidth() <= parent.m_gvpart->widget()->width() ) {
-				tqparent.m_gvpart->miniWidget()->nextPage();
+				parent.m_gvpart->miniWidget()->nextPage();
 				mouseevent->accept();
 				return true;
 			}

kghostview/fullscreenfilter.h

@@ -30,14 +30,14 @@ class FullScreenFilter : public TQObject {
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		FullScreenFilter( KGVShell& tqparent );
+		FullScreenFilter( KGVShell& parent );
 
 		/** 
 		 * @reimplemented
 		 */
 		virtual bool eventFilter( TQObject*, TQEvent* );
 	private:
-		KGVShell& tqparent;
+		KGVShell& parent;
 };
 
 

kghostview/infodialog.cpp

@@ -32,8 +32,8 @@
 //
 // Using KDialogBase in message box mode (gives centered action button)
 //
-InfoDialog::InfoDialog( TQWidget *tqparent, const char *name, bool modal )
+InfoDialog::InfoDialog( TQWidget *parent, const char *name, bool modal )
-  :KDialogBase( i18n("Document Information"), Yes, Yes, Yes, tqparent,
+  :KDialogBase( i18n("Document Information"), Yes, Yes, Yes, parent,
 		name, modal, true, KStdGuiItem::ok() )
 {
   TQFrame *page = makeMainWidget();

kghostview/infodialog.h

@@ -30,7 +30,7 @@ class InfoDialog : public KDialogBase
   TQ_OBJECT
 
   public:
-    InfoDialog( TQWidget *tqparent=0, const char *name=0, bool modal=true );
+    InfoDialog( TQWidget *parent=0, const char *name=0, bool modal=true );
     void setup( const TQString &fileName, const TQString &documentTitle,
 		const TQString &publicationDate );
 

kghostview/kdscerrordialog.cpp

@@ -46,8 +46,8 @@ KDSCErrorHandler::Response KDSCErrorThreshold::error( const KDSCError& err )
 	return Cancel;
 }
     
-KDSCErrorDialog::KDSCErrorDialog( TQWidget* tqparent ) :
+KDSCErrorDialog::KDSCErrorDialog( TQWidget* parent ) :
-    KDialog( tqparent, "dscerrordialog", true ),
+    KDialog( parent, "dscerrordialog", true ),
     _response( Ok )
 {
     TQVBoxLayout* vbox = new TQVBoxLayout( this, marginHint(), spacingHint() );

kghostview/kdscerrordialog.h

@@ -45,7 +45,7 @@ class KDSCErrorDialog : public KDialog, public KDSCErrorHandler
   TQ_OBJECT
 	
 public:
-    KDSCErrorDialog( TQWidget* tqparent = 0 );
+    KDSCErrorDialog( TQWidget* parent = 0 );
     
     Response error( const KDSCError& );
 

kghostview/kgv_miniwidget.cpp

@@ -384,7 +384,7 @@ void KGVMiniWidget::showPage( int pagenumber )
 
     kdDebug(4500) << "KGVMiniWidget::showPage( " << pagenumber << " )" << endl;
 
-    TQT_TQWIDGET( _psWidget->tqparent() )->show();
+    TQT_TQWIDGET( _psWidget->parent() )->show();
 
     _psWidget->setFileName(_document->fileName(), dsc()->isStructured() );
     _psWidget->clear();

kghostview/kgv_view.cpp

@@ -75,9 +75,9 @@ namespace KGV {
 }
 
 KGVPart::KGVPart( TQWidget* parentWidget, const char*,
-                  TQObject* tqparent, const char* name,
+                  TQObject* parent, const char* name,
                   const TQStringList &args ) :
-    KParts::ReadOnlyPart( tqparent, name ),
+    KParts::ReadOnlyPart( parent, name ),
     _fitTimer( new TQTimer( this ) ),
     _job( 0 ),
     _mimetypeScanner( 0 ),
@@ -979,8 +979,8 @@ void KGVPart::setDisplayOptions( const DisplayOptions& options )
 }
 
 
-KGVBrowserExtension::KGVBrowserExtension( KGVPart *tqparent ) :
+KGVBrowserExtension::KGVBrowserExtension( KGVPart *parent ) :
-    KParts::BrowserExtension( tqparent, "KGVBrowserExtension" )
+    KParts::BrowserExtension( parent, "KGVBrowserExtension" )
 {
     emit enableAction( "print", true );
     setURLDropHandlingEnabled( true );
@@ -988,7 +988,7 @@ KGVBrowserExtension::KGVBrowserExtension( KGVPart *tqparent ) :
 
 void KGVBrowserExtension::print()
 {
-    ((KGVPart *)tqparent())->document()->print();
+    ((KGVPart *)parent())->document()->print();
 }
 
 

kghostview/kgv_view.h

@@ -58,7 +58,7 @@ class KGVPart: public KParts::ReadOnlyPart
   TQ_OBJECT
 public:
     KGVPart( TQWidget* parentWidget, const char* widgetName,
-             TQObject* tqparent, const char* name,
+             TQObject* parent, const char* name,
              const TQStringList& args = TQStringList() );
 
     virtual ~KGVPart();
@@ -234,7 +234,7 @@ class KGVBrowserExtension : public KParts::BrowserExtension
   TQ_OBJECT
     friend class KGVPart; // emits our signals
 public:
-    KGVBrowserExtension( KGVPart* tqparent );
+    KGVBrowserExtension( KGVPart* parent );
     virtual ~KGVBrowserExtension() {}
 
 public slots:

kghostview/kgvdocument.cpp

@@ -801,8 +801,8 @@ void KGVDocument::pdf2psExited( KProcess* process )
 }
 */
 
-Pdf2dsc::Pdf2dsc( const TQString& ghostscriptPath, TQObject* tqparent, const char* name ) :
+Pdf2dsc::Pdf2dsc( const TQString& ghostscriptPath, TQObject* parent, const char* name ) :
-    TQObject( tqparent, name ),
+    TQObject( parent, name ),
     _process( 0 ),
     _ghostscriptPath( ghostscriptPath )
 {}

kghostview/kgvdocument.h

@@ -163,7 +163,7 @@ class Pdf2dsc : public TQObject
   TQ_OBJECT
 	
 public:
-    Pdf2dsc( const TQString& ghostscriptPath, TQObject* tqparent = 0, const char* name = 0 );
+    Pdf2dsc( const TQString& ghostscriptPath, TQObject* parent = 0, const char* name = 0 );
     ~Pdf2dsc();
     
     void run( const TQString& pdfName, const TQString& dscName );

kghostview/kgvfactory.cpp

@@ -53,7 +53,7 @@ KInstance *KGVFactory::s_instance;
 KAboutData *KGVFactory::s_aboutData;
 
 KParts::Part *KGVFactory::createPartObject( TQWidget *parentWidget, const char *widgetName,
-        TQObject *tqparent, const char *name,
+        TQObject *parent, const char *name,
         const char *className,
         const TQStringList &args_ )
 {
@@ -70,7 +70,7 @@ KParts::Part *KGVFactory::createPartObject( TQWidget *parentWidget, const char *
     }
     KGVPart *part = KDEPrivate::ConcreteFactory<KGVPart>::create( parentWidget,
             widgetName,
-            tqparent,
+            parent,
             name,
             className,
             args );

kghostview/kgvfactory.h

@@ -34,7 +34,7 @@ class KDE_EXPORT KGVFactory : public KParts::Factory
         static KAboutData *aboutData();
 
         virtual KParts::Part *createPartObject( TQWidget *parentWidget, const char *widgetName,
-                TQObject *tqparent, const char *name,
+                TQObject *parent, const char *name,
                 const char *className,
                 const TQStringList &args );
 

kghostview/kgvmainwidget.cpp

@@ -20,8 +20,8 @@
 #include <kurl.h>
 #include <kurldrag.h>
 
-KGVMainWidget::KGVMainWidget( TQWidget* tqparent, const char* name )
+KGVMainWidget::KGVMainWidget( TQWidget* parent, const char* name )
-  : TQWidget( tqparent, name ) {}
+  : TQWidget( parent, name ) {}
 
 void KGVMainWidget::keyPressEvent( TQKeyEvent* event )
 {

kghostview/kgvmainwidget.h

@@ -29,7 +29,7 @@ class KGVMainWidget : public TQWidget
   TQ_OBJECT
     
 public:
-    KGVMainWidget( TQWidget* tqparent = 0, const char* name = 0 );
+    KGVMainWidget( TQWidget* parent = 0, const char* name = 0 );
 
 signals:
     void spacePressed();

kghostview/kgvpagedecorator.cpp

@@ -23,8 +23,8 @@
 
 #include "kgvpagedecorator.h"
     
-KGVPageDecorator::KGVPageDecorator( TQWidget* tqparent, const char* name ) : 
+KGVPageDecorator::KGVPageDecorator( TQWidget* parent, const char* name ) : 
-    TQHBox( tqparent, name ), 
+    TQHBox( parent, name ), 
     _margin( 5 ), 
     _borderWidth( 1 ), 
     _shadowOffset( 2, 2 )

kghostview/kgvpagedecorator.h

@@ -24,7 +24,7 @@
 class KGVPageDecorator : public TQHBox
 {
 public:
-    KGVPageDecorator( TQWidget* tqparent = 0, const char* name = 0 );
+    KGVPageDecorator( TQWidget* parent = 0, const char* name = 0 );
     ~KGVPageDecorator() { ; }
 
     unsigned int margin()      const;
@@ -49,13 +49,13 @@ protected:
     virtual void drawFrame( TQPainter* );
     
     /**
-     * Draw the tqmask of both the frame and the contents in order to create a 
+     * Draw the mask of both the frame and the contents in order to create a 
      * partially transparent frame.
      */ 
     virtual void drawMask( TQPainter* );
     
     /**
-     * Reimplemented from TQWidget. It uses @ref drawMask() to draw the tqmask
+     * Reimplemented from TQWidget. It uses @ref drawMask() to draw the mask
      * of the frame when transparency is required.
      */
     virtual void updateMask();

kghostview/kgvpageview.cpp

@@ -22,8 +22,8 @@
 
 #include "kgvpageview.h"
 
-KGVPageView::KGVPageView( TQWidget* tqparent, const char* name )
+KGVPageView::KGVPageView( TQWidget* parent, const char* name )
-  : TQScrollView( tqparent, name )
+  : TQScrollView( parent, name )
 {
     _page = 0;
 

kghostview/kgvpageview.h

@@ -33,7 +33,7 @@ class KGVPageView : public TQScrollView
   TQ_OBJECT
 
 public:
-    KGVPageView( TQWidget* tqparent = 0, const char* name = 0 );
+    KGVPageView( TQWidget* parent = 0, const char* name = 0 );
     ~KGVPageView() { ; }
     
     void setPage( TQWidget* );

kghostview/kpswidget.cpp

@@ -80,8 +80,8 @@ TQCString palette2String( Configuration::EnumPalette::type palette )
 }
 
 
-KPSWidget::KPSWidget( TQWidget* tqparent, const char* name ) : 
+KPSWidget::KPSWidget( TQWidget* parent, const char* name ) : 
-    TQWidget           ( tqparent, name ),
+    TQWidget           ( parent, name ),
     _gsWindow         ( None ),
     _usePipe          ( false ),
     _doubleBuffer     ( false ),

kghostview/kpswidget.h

@@ -49,7 +49,7 @@ class KPSWidget : public TQWidget
   TQ_OBJECT
 
 public:
-    KPSWidget( TQWidget* tqparent = 0, const char* name = 0 );
+    KPSWidget( TQWidget* parent = 0, const char* name = 0 );
     ~KPSWidget();
 
     /**

kghostview/logwindow.cpp

@@ -27,8 +27,8 @@
 #include "logwindow.h"
 
 LogWindow::LogWindow( const TQString& caption, 
-                      TQWidget* tqparent, const char* name) :
+                      TQWidget* parent, const char* name) :
-    KDialogBase( tqparent, name, false, caption, User1|Close, Close, false, 
+    KDialogBase( parent, name, false, caption, User1|Close, Close, false, 
                  KStdGuiItem::clear() )
 {
     TQVBox * display = makeVBoxMainWidget();

kghostview/logwindow.h

@@ -32,7 +32,7 @@ class LogWindow : public KDialogBase
 
 public:
     LogWindow( const TQString& caption,
-               TQWidget* tqparent = 0, const char* name = 0 );
+               TQWidget* parent = 0, const char* name = 0 );
 
 public slots:
     void append( const TQString& message );

kghostview/marklist.cpp

@@ -32,8 +32,8 @@
 
 #include "kgv_miniwidget.h"
 
-MarkListItem::MarkListItem(TQWidget *tqparent, const TQString &text, const TQString &tip, const TQColor &color, KGVMiniWidget* miniW, int pageNum)
+MarkListItem::MarkListItem(TQWidget *parent, const TQString &text, const TQString &tip, const TQColor &color, KGVMiniWidget* miniW, int pageNum)
-    : TQWidget( tqparent ),
+    : TQWidget( parent ),
     _miniWidget( miniW ),
     _pageNum( pageNum ),
     _requested( false )
@@ -113,8 +113,8 @@ void MarkListItem::paintEvent( TQPaintEvent* )
 
 /* MarkList */
 
-MarkList::MarkList( TQWidget* tqparent, const char* name, KGVMiniWidget* mini)
+MarkList::MarkList( TQWidget* parent, const char* name, KGVMiniWidget* mini)
-    : TQTable( tqparent, name ),
+    : TQTable( parent, name ),
     _selected ( -1 ),
 _miniWidget( mini )
 {

kghostview/marklist.h

@@ -29,7 +29,7 @@ class MarkListItem : public TQWidget
     Q_OBJECT
   TQ_OBJECT
 public:
-    MarkListItem( TQWidget *tqparent, const TQString &text, const TQString &tip, const TQColor &color, KGVMiniWidget*, int );
+    MarkListItem( TQWidget *parent, const TQString &text, const TQString &tip, const TQColor &color, KGVMiniWidget*, int );
 
     bool isChecked() const;
 
@@ -58,7 +58,7 @@ class MarkList: public TQTable
   TQ_OBJECT
 
 public:
-    MarkList( TQWidget* tqparent = 0, const char* name = 0, KGVMiniWidget* = 0 );
+    MarkList( TQWidget* parent = 0, const char* name = 0, KGVMiniWidget* = 0 );
 
     TQValueList<int> markList() const;
     void insertItem( const TQString& text, int index = -1,

kghostview/scrollbox.cpp

@@ -22,8 +22,8 @@
 
 #include "scrollbox.h"
 
-ScrollBox::ScrollBox( TQWidget* tqparent, const char* name )
+ScrollBox::ScrollBox( TQWidget* parent, const char* name )
-    : TQFrame( tqparent, name )
+    : TQFrame( parent, name )
 {
     setFrameStyle( Panel | Sunken );
 }

kghostview/scrollbox.h

@@ -28,7 +28,7 @@ class ScrollBox: public TQFrame
   TQ_OBJECT
 
 public:
-    ScrollBox( TQWidget* tqparent = 0, const char* name = 0 );
+    ScrollBox( TQWidget* parent = 0, const char* name = 0 );
 
 public slots:
     void setPageSize( const TQSize& );

kghostview/thumbnailservice.cpp

@@ -28,14 +28,14 @@
 #include <cassert>
 #include <cstring>
 
-ThumbnailService::ThumbnailService( KGVMiniWidget* tqparent, const char* name ) :
+ThumbnailService::ThumbnailService( KGVMiniWidget* parent, const char* name ) :
-	TQObject( tqparent, name ),
+	TQObject( parent, name ),
-	_mini( tqparent ),
+	_mini( parent ),
 	timer_( new TQTimer( this ) ),
 	_busy( false ),
 	_enabled( false )
 {
-	_thumbnailDrawer = new KPSWidget( tqparent->_part->widget(), "thumbnail-drawer" );
+	_thumbnailDrawer = new KPSWidget( parent->_part->widget(), "thumbnail-drawer" );
 	_thumbnailDrawer->readSettings();
 	connect(  _thumbnailDrawer, TQT_SIGNAL(  newPageImage(  TQPixmap ) ), TQT_SLOT( slotDone( TQPixmap ) ) );
 	connect( timer_, TQT_SIGNAL( timeout() ), TQT_SLOT( processOne() ) );

kghostview/thumbnailservice.h

@@ -32,7 +32,7 @@ class ThumbnailService : public TQObject {
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		ThumbnailService( KGVMiniWidget* tqparent, const char* name = 0 );
+		ThumbnailService( KGVMiniWidget* parent, const char* name = 0 );
 		~ThumbnailService();
 
 	public slots:

kghostview/viewcontrol.cpp

@@ -25,8 +25,8 @@
 #include <kbuttonbox.h>
 #include <kseparator.h>
 
-ViewControl::ViewControl( TQWidget *tqparent, const char *name )
+ViewControl::ViewControl( TQWidget *parent, const char *name )
-	: TQDialog( tqparent, name )
+	: TQDialog( parent, name )
 {
 	setFocusPolicy(TQ_StrongFocus);
 

kghostview/viewcontrol.h

@@ -11,7 +11,7 @@ class ViewControl : public TQDialog
 	Q_OBJECT
   TQ_OBJECT
 public:
-	ViewControl( TQWidget *tqparent, const char *name );
+	ViewControl( TQWidget *parent, const char *name );
 	TQComboBox* magComboBox;
 	TQComboBox* mediaComboBox;
 	TQComboBox* orientComboBox;

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)
+KColorGrid::KColorGrid(TQWidget *parent, const char *name, int space)
- : TQWidget(tqparent, name, TQt::WResizeNoErase|TQt::WRepaintNoErase)
+ : TQWidget(parent, name, TQt::WResizeNoErase|TQt::WRepaintNoErase)
 {
   //kdDebug(4640) << "KColorGrid - constructor" << endl;
   s = space;

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 };

kiconedit/kicon.cpp

@@ -32,8 +32,8 @@
 #include "kicon.h"
 #include "utils.h"
 
-KIconEditIcon::KIconEditIcon(TQObject *tqparent, const TQImage *img, KURL url) 
+KIconEditIcon::KIconEditIcon(TQObject *parent, const TQImage *img, KURL url) 
-   : TQObject(tqparent)
+   : 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;
     }
 

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);

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);
 
 };
 

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) 
+KTemplateEditDlg::KTemplateEditDlg(TQWidget *parent) 
-    : KDialogBase(tqparent, "KTemplateEditDlg", true, i18n( "Icon Template" ),
+    : 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 )
+KBackgroundConfig::KBackgroundConfig( TQWidget* parent )
-  : TQWidget( tqparent )
+  : 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());

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:

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()

kiconedit/kicongrid.cpp

@@ -67,8 +67,8 @@ void RepaintCommand::execute()
         grid->update( area);
 }
 
-KGridView::KGridView(TQImage *image, KCommandHistory* history, TQWidget *tqparent, const char *name)
+KGridView::KGridView(TQImage *image, KCommandHistory* history, TQWidget *parent, const char *name)
-: TQFrame(tqparent, 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)
+KIconEditGrid::KIconEditGrid(TQImage *image, KCommandHistory* h, TQWidget *parent, const char *name)
- : KColorGrid(tqparent, name, 1)
+ : 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());
+    mask = TQPixmap(pix.createHeuristicMask());
-    pix.setMask(tqmask);
+    pix.setMask(mask);
     cursor_colorpicker = TQCursor(pix, 1, 21);
   }
 
@@ -1452,8 +1452,8 @@ void KIconEditGrid::createCursors()
   }
   else
   {
-    tqmask = TQPixmap(pix.createHeuristicMask());
+    mask = TQPixmap(pix.createHeuristicMask());
-    pix.setMask(tqmask);
+    pix.setMask(mask);
     cursor_paint = TQCursor(pix, 0, 19);
   }
 
@@ -1465,8 +1465,8 @@ void KIconEditGrid::createCursors()
   }
   else
   {
-    tqmask = TQPixmap(pix.createHeuristicMask());
+    mask = TQPixmap(pix.createHeuristicMask());
-    pix.setMask(tqmask);
+    pix.setMask(mask);
     cursor_flood = TQCursor(pix, 3, 20);
   }
 
@@ -1478,8 +1478,8 @@ void KIconEditGrid::createCursors()
   }
   else
   {
-    tqmask = TQPixmap(pix.createHeuristicMask());
+    mask = TQPixmap(pix.createHeuristicMask());
-    pix.setMask(tqmask);
+    pix.setMask(mask);
     cursor_aim = TQCursor(pix, 10, 10);
   }
 
@@ -1491,8 +1491,8 @@ void KIconEditGrid::createCursors()
   }
   else
   {
-    tqmask = TQPixmap(pix.createHeuristicMask(true));
+    mask = TQPixmap(pix.createHeuristicMask(true));
-    pix.setMask(tqmask);
+    pix.setMask(mask);
     cursor_spray = TQCursor(pix, 0, 20);
   }
 
@@ -1504,8 +1504,8 @@ void KIconEditGrid::createCursors()
   }
   else
   {
-    tqmask = TQPixmap(pix.createHeuristicMask(true));
+    mask = TQPixmap(pix.createHeuristicMask(true));
-    pix.setMask(tqmask);
+    pix.setMask(mask);
     cursor_erase = TQCursor(pix, 1, 16);
   }
 }

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,

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 )
+NewFromTemplate::NewFromTemplate( TQWidget* parent )
-  : TQWidget( tqparent )
+  : 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 )
+KNewIcon::KNewIcon( TQWidget* parent )
-  : KWizard( tqparent, 0, true )
+  : KWizard( parent, 0, true )
 {
   //kdDebug(4640) << "KNewIcon" << endl;
   setCaption( i18n( "Create New Icon" ) );

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};

kiconedit/kresize.cpp

@@ -28,8 +28,8 @@
 
 #include "kresize.h"
 
-KResizeWidget::KResizeWidget( TQWidget* tqparent, const char* name, 
+KResizeWidget::KResizeWidget( TQWidget* parent, const char* name, 
-    const TQSize& size ) : TQWidget( tqparent, 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 );
 

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();

kiconedit/palettetoolbar.cpp

@@ -30,8 +30,8 @@
 #include "kiconcolors.h"
 #include "palettetoolbar.h"
 
-PaletteToolBar::PaletteToolBar( TQWidget *tqparent, const char *name )
+PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name )
-    : KToolBar( tqparent, name )
+    : KToolBar( parent, name )
 {
   TQWidget *base = new TQWidget( this );
 

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 );

kmrml/kmrml/algorithmcombo.cpp

@@ -25,8 +25,8 @@ using namespace KMrml;
 // ### copycat of CollectionCombo... tqmoc can't handle templates unfortunately..
 // could use base-class MrmlElement....
 
-AlgorithmCombo::AlgorithmCombo( TQWidget *tqparent, const char *name )
+AlgorithmCombo::AlgorithmCombo( TQWidget *parent, const char *name )
-    : KComboBox( false, tqparent, name ),
+    : KComboBox( false, parent, name ),
       m_algorithms( 0L )
 {
     connect( this, TQT_SIGNAL( activated( const TQString& ) ),

kmrml/kmrml/algorithmcombo.h

@@ -32,7 +32,7 @@ namespace KMrml
   TQ_OBJECT
 
     public:
-        AlgorithmCombo( TQWidget *tqparent, const char *name = 0 );
+        AlgorithmCombo( TQWidget *parent, const char *name = 0 );
         ~AlgorithmCombo();
 
         void setAlgorithms( const AlgorithmList * algorithms );

kmrml/kmrml/algorithmdialog.cpp

@@ -34,8 +34,8 @@ using namespace KMrml;
 class ScrollView : public TQScrollView
 {
 public:
-    ScrollView(TQWidget* tqparent = 0, const char* name = 0)
+    ScrollView(TQWidget* parent = 0, const char* name = 0)
-        : TQScrollView(tqparent, name)
+        : TQScrollView(parent, name)
     {
         setFrameStyle(TQFrame::NoFrame);
         m_frame = new TQFrame(viewport(), "ScrollView::m_frame");
@@ -60,8 +60,8 @@ private:
 AlgorithmDialog::AlgorithmDialog( const AlgorithmList& algorithms,
                                   const CollectionList& collections,
                                   const Collection& currentColl,
-                                  TQWidget *tqparent, const char *name )
+                                  TQWidget *parent, const char *name )
-    : KDialogBase( tqparent, name, false, i18n("Configure Query Algorithms"),
+    : KDialogBase( parent, name, false, i18n("Configure Query Algorithms"),
                    Ok | Cancel, Ok, false ),
       m_allAlgorithms( algorithms ),
       m_collections( collections )

kmrml/kmrml/algorithmdialog.h

@@ -37,7 +37,7 @@ namespace KMrml
     public:
         AlgorithmDialog( const AlgorithmList&, const CollectionList&,
                          const Collection& currentColl,
-                         TQWidget *tqparent = 0, const char *name = 0 );
+                         TQWidget *parent = 0, const char *name = 0 );
         ~AlgorithmDialog();
 
     private slots:

kmrml/kmrml/browser.cpp

@@ -23,9 +23,9 @@
 
 using namespace KMrml;
 
-Browser::Browser( MrmlPart *tqparent, const char *name )
+Browser::Browser( MrmlPart *parent, const char *name )
-    : KParts::BrowserExtension( tqparent, name ),
+    : KParts::BrowserExtension( parent, name ),
-      m_part( tqparent )
+      m_part( parent )
 {
 
 }

kmrml/kmrml/browser.h

@@ -31,7 +31,7 @@ namespace KMrml
   TQ_OBJECT
 
     public:
-        Browser( MrmlPart *tqparent, const char *name );
+        Browser( MrmlPart *parent, const char *name );
         ~Browser();
 
         virtual void saveState( TQDataStream& stream );

kmrml/kmrml/collectioncombo.cpp

@@ -22,8 +22,8 @@
 
 using namespace KMrml;
 
-CollectionCombo::CollectionCombo( TQWidget *tqparent, const char *name )
+CollectionCombo::CollectionCombo( TQWidget *parent, const char *name )
-    : KComboBox( false, tqparent, name ),
+    : KComboBox( false, parent, name ),
       m_collections( 0L )
 {
     connect( this, TQT_SIGNAL( activated( const TQString& ) ),

kmrml/kmrml/collectioncombo.h

@@ -32,7 +32,7 @@ namespace KMrml
   TQ_OBJECT
 
     public:
-        CollectionCombo( TQWidget *tqparent, const char *name = 0 );
+        CollectionCombo( TQWidget *parent, const char *name = 0 );
         ~CollectionCombo();
 
         void setCollections( const CollectionList * collections );

kmrml/kmrml/kcontrol/indexcleaner.cpp

@@ -15,8 +15,8 @@ using namespace KMrmlConfig;
 
 IndexCleaner::IndexCleaner( const TQStringList& dirs,
                             const KMrml::Config *config,
-                            TQObject *tqparent, const char *name )
+                            TQObject *parent, const char *name )
-    : TQObject( tqparent, name ),
+    : TQObject( parent, name ),
       m_dirs( dirs ),
       m_config( config ),
       m_process( 0L )

kmrml/kmrml/kcontrol/indexcleaner.h

@@ -27,7 +27,7 @@ namespace KMrmlConfig
 
     public:
         IndexCleaner( const TQStringList& dirs, const KMrml::Config *config,
-                      TQObject *tqparent = 0, const char *name = 0 );
+                      TQObject *parent = 0, const char *name = 0 );
         ~IndexCleaner();
 
         void start();

kmrml/kmrml/kcontrol/indexer.cpp

@@ -36,8 +36,8 @@
 using namespace KMrmlConfig;
 
 Indexer::Indexer( const KMrml::Config* config,
-                  TQObject *tqparent, const char *name )
+                  TQObject *parent, const char *name )
-    : TQObject( tqparent, name ),
+    : TQObject( parent, name ),
       m_config( config ),
       m_dirCount( 0 )
 {

kmrml/kmrml/kcontrol/indexer.h

@@ -35,7 +35,7 @@ namespace KMrmlConfig
 
     public:
         Indexer( const KMrml::Config *config,
-                 TQObject *tqparent = 0L, const char *name = 0 );
+                 TQObject *parent = 0L, const char *name = 0 );
         ~Indexer();
 
         void startIndexing( const TQStringList& dirs );

kmrml/kmrml/kcontrol/kcmkmrml.cpp

@@ -43,8 +43,8 @@ static const int COL_FILENAME = 1;
 typedef KGenericFactory<KCMKMrml, TQWidget> MrmlFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kmrml, MrmlFactory("kmrml") )
 
-KCMKMrml::KCMKMrml(TQWidget *tqparent, const char *name, const TQStringList & ):
+KCMKMrml::KCMKMrml(TQWidget *parent, const char *name, const TQStringList & ):
-    KCModule(MrmlFactory::instance(), tqparent, name)
+    KCModule(MrmlFactory::instance(), parent, name)
 {
     KAboutData* ab = new KAboutData(
         "kcmkmrml",

kmrml/kmrml/kcontrol/kcmkmrml.h

@@ -34,7 +34,7 @@ namespace KMrmlConfig
   TQ_OBJECT
     
     public:
-        KCMKMrml(TQWidget *tqparent, const char *name, const TQStringList &);
+        KCMKMrml(TQWidget *parent, const char *name, const TQStringList &);
         virtual ~KCMKMrml();
 
         virtual void defaults();

kmrml/kmrml/kcontrol/mainpage.cpp

@@ -50,8 +50,8 @@
 using namespace KMrmlConfig;
 
 
-MainPage::MainPage( TQWidget *tqparent, const char *name )
+MainPage::MainPage( TQWidget *parent, const char *name )
-    : TQVBox( tqparent, name ),
+    : TQVBox( parent, name ),
       m_indexer( 0L ),
       m_indexCleaner( 0L ),
       m_progressDialog( 0L ),

kmrml/kmrml/kcontrol/mainpage.h

@@ -49,7 +49,7 @@ namespace KMrmlConfig
   TQ_OBJECT
 
     public:
-        MainPage( TQWidget *tqparent, const char *name );
+        MainPage( TQWidget *parent, const char *name );
         ~MainPage();
 
         void resetDefaults();

kmrml/kmrml/mrml_creator.cpp

@@ -65,12 +65,12 @@ TQDomElement MrmlCreator::addRelevanceList( TQDomElement& query )
  * Creates a <user-relevance-element> with the given attributes set.
  */
 void MrmlCreator::createRelevanceElement( TQDomDocument& doc,
-                                          TQDomElement& tqparent,
+                                          TQDomElement& parent,
                                           const TQString& url,
                                           Relevance relevance )
 {
     TQDomElement element = doc.createElement( "user-relevance-element" );
     element.setAttribute( "image-location", url );
     element.setAttribute( "user-relevance", TQString::number( relevance ) );
-    tqparent.appendChild( element );
+    parent.appendChild( element );
 }

kmrml/kmrml/mrml_creator.h

@@ -41,7 +41,7 @@ namespace MrmlCreator
     /**
      * Creates a <user-relevance-element> with the given attributes set.
      */
-    void createRelevanceElement( TQDomDocument& doc, TQDomElement& tqparent,
+    void createRelevanceElement( TQDomDocument& doc, TQDomElement& parent,
                                  const TQString& url, Relevance relevance );
 
 }

kmrml/kmrml/mrml_elements.cpp

@@ -144,11 +144,11 @@ Algorithm Algorithm::defaultAlgorithm()
     return algo;
 }
 
-TQDomElement Algorithm::toElement( TQDomElement& tqparent ) const
+TQDomElement Algorithm::toElement( TQDomElement& parent ) const
 {
-    TQDomDocument doc = tqparent.ownerDocument();
+    TQDomDocument doc = parent.ownerDocument();
     TQDomElement algorithm = doc.createElement( MrmlShared::algorithm() );
-    tqparent.appendChild( algorithm );
+    parent.appendChild( algorithm );
     setOtherAttributes( algorithm );
 
     if ( !m_name.isEmpty() )
@@ -242,12 +242,12 @@ bool QueryParadigmList::matches( const QueryParadigmList& other ) const
 ///////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////
 
-TQValueList<TQDomElement> KMrml::directChildElements( const TQDomElement& tqparent,
+TQValueList<TQDomElement> KMrml::directChildElements( const TQDomElement& parent,
                                                     const TQString& tagName )
 {
     TQValueList<TQDomElement> list;
 
-    TQDomNode node = tqparent.firstChild();
+    TQDomNode node = parent.firstChild();
     while ( !node.isNull() )
     {
         if ( node.isElement() && node.nodeName() == tagName )
@@ -259,10 +259,10 @@ TQValueList<TQDomElement> KMrml::directChildElements( const TQDomElement& tqpare
     return list;
 }
 
-TQDomElement KMrml::firstChildElement( const TQDomElement& tqparent,
+TQDomElement KMrml::firstChildElement( const TQDomElement& parent,
                                       const TQString& tagName )
 {
-    TQDomNode node = tqparent.firstChild();
+    TQDomNode node = parent.firstChild();
     while ( !node.isNull() )
     {
         if ( node.isElement() && node.nodeName() == tagName )

kmrml/kmrml/mrml_elements.h

@@ -106,7 +106,7 @@ namespace KMrml
             m_collectionId = id;
         }
 
-        TQDomElement toElement( TQDomElement& tqparent ) const;
+        TQDomElement toElement( TQDomElement& parent ) const;
         const PropertySheet& propertySheet() const;
 
         static Algorithm defaultAlgorithm();
@@ -221,9 +221,9 @@ namespace KMrml
     };
 
 
-    TQValueList<TQDomElement> directChildElements( const TQDomElement& tqparent,
+    TQValueList<TQDomElement> directChildElements( const TQDomElement& parent,
                                                  const TQString& tagName);
-    TQDomElement firstChildElement( const TQDomElement& tqparent,
+    TQDomElement firstChildElement( const TQDomElement& parent,
                                    const TQString& tagName );
 
 

kmrml/kmrml/mrml_part.cpp

@@ -92,12 +92,12 @@ KInstance * PartFactory::instance()
 
 KParts::Part * PartFactory::createPartObject( TQWidget *parentWidget,
                                               const char *widgetName,
-                                              TQObject *tqparent,
+                                              TQObject *parent,
                                               const char *name,
                                               const char *,
                                               const TQStringList& args )
 {
-    return new MrmlPart( parentWidget, widgetName, tqparent, name, args );
+    return new MrmlPart( parentWidget, widgetName, parent, name, args );
 }
 
 
@@ -112,9 +112,9 @@ KParts::Part * PartFactory::createPartObject( TQWidget *parentWidget,
 uint MrmlPart::s_sessionId = 0;
 
 MrmlPart::MrmlPart( TQWidget *parentWidget, const char * /* widgetName */,
-                    TQObject *tqparent, const char *name,
+                    TQObject *parent, const char *name,
                     const TQStringList& /* args */ )
-    : KParts::ReadOnlyPart( tqparent, name ),
+    : KParts::ReadOnlyPart( parent, name ),
       m_job( 0L ),
       m_status( NeedCollection )
 {

kmrml/kmrml/mrml_part.h

@@ -60,7 +60,7 @@ public:
     enum tqStatus { NeedCollection, CanSearch, InProgress };
 
     MrmlPart( TQWidget *parentWidget, const char *widgetName,
-              TQObject *tqparent, const char *name, const TQStringList& args );
+              TQObject *parent, const char *name, const TQStringList& args );
     ~MrmlPart();
 
     TQString sessionId() const { return m_sessionId; }
@@ -162,7 +162,7 @@ public:
 protected:
     virtual KParts::Part * createPartObject( TQWidget *parentWidget = 0,
                                         const char *widgetName = 0,
-                                        TQObject *tqparent = 0,
+                                        TQObject *parent = 0,
                                         const char *name = 0,
                                         const char *classname = "KParts::Part",
                                         const TQStringList& args = TQStringList() );

kmrml/kmrml/mrml_view.cpp

@@ -37,8 +37,8 @@
 
 using namespace KMrml;
 
-MrmlView::MrmlView( TQWidget *tqparent, const char *name )
+MrmlView::MrmlView( TQWidget *parent, const char *name )
-    : TQScrollView( tqparent, name )
+    : TQScrollView( parent, name )
 {
     setStaticBackground( true );
     setResizePolicy( Manual );
@@ -103,11 +103,11 @@ MrmlViewItem * MrmlView::addItem( const KURL& url, const KURL& thumbURL,
 }
 
 void MrmlView::addRelevanceToQuery( TQDomDocument& document,
-                                    TQDomElement& tqparent )
+                                    TQDomElement& parent )
 {
     TQPtrListIterator<MrmlViewItem> it( m_items );
     for( ; it.current(); ++it ) {
-        it.current()->createRelevanceElement( document, tqparent );
+        it.current()->createRelevanceElement( document, parent );
     }
 }
 
@@ -439,13 +439,13 @@ bool MrmlViewItem::hitsPixmap( const TQPoint& pos ) const
 }
 
 void MrmlViewItem::createRelevanceElement( TQDomDocument& document,
-                                           TQDomElement& tqparent )
+                                           TQDomElement& parent )
 {
     int rel = m_combo->currentItem();
     if ( rel == Neutral )
         return;
 
-    MrmlCreator::createRelevanceElement( document, tqparent, m_url.url(),
+    MrmlCreator::createRelevanceElement( document, parent, m_url.url(),
         (rel == Relevant) ? MrmlCreator::Relevant : MrmlCreator::Irrelevant );
 }
 

kmrml/kmrml/mrml_view.h

@@ -55,7 +55,7 @@ class MrmlView : public TQScrollView
   TQ_OBJECT
 
 public:
-    MrmlView( TQWidget *tqparent = 0L, const char *name = 0L );
+    MrmlView( TQWidget *parent = 0L, const char *name = 0L );
     ~MrmlView();
 
     MrmlViewItem * addItem( const KURL& url, const KURL& thumbURL,
@@ -64,7 +64,7 @@ public:
                             double similarity );
 
 
-    void addRelevanceToQuery( TQDomDocument&, TQDomElement& tqparent );
+    void addRelevanceToQuery( TQDomDocument&, TQDomElement& parent );
 
     void clear();
 
@@ -120,7 +120,7 @@ public:
 
     void setPixmap( const TQPixmap& pixmap );
 
-    void createRelevanceElement( TQDomDocument& document, TQDomElement& tqparent );
+    void createRelevanceElement( TQDomDocument& document, TQDomElement& parent );
 
     double similarity() const { return m_similarity; }
 

kmrml/kmrml/propertysheet.cpp

@@ -105,7 +105,7 @@ void PropertySheet::initFromDOM( const TQDomElement& elem )
         m_subSheets.append( new PropertySheet( *it ) );
 }
 
-TQWidget * PropertySheet::createWidget( TQWidget */*tqparent*/, const char */*name*/ )
+TQWidget * PropertySheet::createWidget( TQWidget */*parent*/, const char */*name*/ )
 {
     TQWidget *w = 0L;
 

kmrml/kmrml/propertysheet.h

@@ -71,9 +71,9 @@ namespace KMrml
         }
         void initFromDOM( const TQDomElement& elem );
 
-        void toElement( TQDomElement& tqparent );
+        void toElement( TQDomElement& parent );
 
-        TQWidget * createWidget( TQWidget *tqparent, const char *name = 0 );
+        TQWidget * createWidget( TQWidget *parent, const char *name = 0 );
 
     private:
         static Visibility getVisibility( const TQString& value );

kmrml/kmrml/propertywidgets.cpp

@@ -19,8 +19,8 @@
 #include "propertywidgets.h"
 
 IntegerWidget::IntegerWidget( const PropertySheet& sheet,
-                              TQWidget *tqparent, const char *name )
+                              TQWidget *parent, const char *name )
-    : TQHBox( tqparent, name )
+    : TQHBox( parent, name )
 {
     
 }
@@ -39,8 +39,8 @@ int IntegerWidget::value() const
 ///////////////////////////////////////////////////////////////////
 
 ComboWidget::ComboWidget( const PropertySheet& sheet,
-                              TQWidget *tqparent, const char *name )
+                              TQWidget *parent, const char *name )
-    : TQHBox( tqparent, name )
+    : TQHBox( parent, name )
 {
     
 }
@@ -60,8 +60,8 @@ TQString ComboWidget::value() const
 ///////////////////////////////////////////////////////////////////
 
 CheckBoxWidget::CheckBoxWidget( const PropertySheet& sheet,
-                              TQWidget *tqparent, const char *name )
+                              TQWidget *parent, const char *name )
-    : TQHBox( tqparent, name )
+    : TQHBox( parent, name )
 {
     
 }
@@ -81,8 +81,8 @@ bool CheckBoxWidget::value() const
 ///////////////////////////////////////////////////////////////////
 
 LineEditWidget::LineEditWidget( const PropertySheet& sheet,
-                              TQWidget *tqparent, const char *name )
+                              TQWidget *parent, const char *name )
-    : TQHBox( tqparent, name )
+    : TQHBox( parent, name )
 {
     
 }
@@ -102,8 +102,8 @@ TQString LineEditWidget::value() const
 ///////////////////////////////////////////////////////////////////
 
 ListBoxWidget::ListBoxWidget( const PropertySheet& sheet,
-                              TQWidget *tqparent, const char *name )
+                              TQWidget *parent, const char *name )
-    : TQHBox( tqparent, name )
+    : TQHBox( parent, name )
 {
     
 }

kmrml/kmrml/propertywidgets.h

@@ -32,7 +32,7 @@ namespace KMrml
         
     public:
         IntegerWidget( const PropertySheet& sheet, 
-                       TQWidget *tqparent = tqparent, const char *name = 0L );
+                       TQWidget *parent = parent, const char *name = 0L );
         ~IntegerWidget();
 
         int value() const;
@@ -48,7 +48,7 @@ namespace KMrml
         
     public:
         ComboWidget( const PropertySheet& sheet, 
-                     TQWidget *tqparent = tqparent, const char *name = 0L );
+                     TQWidget *parent = parent, const char *name = 0L );
         ~ComboWidget();
         
         TQString value() const;
@@ -64,7 +64,7 @@ namespace KMrml
         
     public:
         CheckBoxWidget( const PropertySheet& sheet, 
-                        TQWidget *tqparent = tqparent, const char *name = 0L );
+                        TQWidget *parent = parent, const char *name = 0L );
         ~CheckBoxWidget();
         
         bool value();
@@ -82,7 +82,7 @@ namespace KMrml
         
     public:
         LineEditWidget( const PropertySheet& sheet, 
-                        TQWidget *tqparent = tqparent, const char *name = 0L );
+                        TQWidget *parent = parent, const char *name = 0L );
         ~LineEditWidget();
         
         TQString value();
@@ -98,7 +98,7 @@ namespace KMrml
         
     public:
         ListBoxWidget( const PropertySheet& sheet, 
-                       TQWidget *tqparent = tqparent, const char *name = 0L );
+                       TQWidget *parent = parent, const char *name = 0L );
         ~ListBoxWidget();
         
         TQStringList values();

kolourpaint/kpcommandhistory.cpp

@@ -927,7 +927,7 @@ void kpCommandHistory::redo ()
         // Not completely obvious but what else can we do?
         //
         // Ignoring the request would not be intuitive for tools like
-        // Polygon & Polyline (where it's not always aptqparent to the user
+        // Polygon & Polyline (where it's not always apparent to the user
         // that s/he's still drawing a tqshape even though the mouse isn't
         // down).
         m_mainWindow->tool ()->cancelShapeInternal ();

kolourpaint/kpdocument.cpp

@@ -231,12 +231,12 @@ TQPixmap kpDocument::convertToPixmapAsLosslessAsPossible (
 
 // public static
 TQPixmap kpDocument::getPixmapFromFile (const KURL &url, bool suppressDoesntExistDialog,
-                                       TQWidget *tqparent,
+                                       TQWidget *parent,
                                        kpDocumentSaveOptions *saveOptions,
                                        kpDocumentMetaInfo *metaInfo)
 {
 #if DEBUG_KP_DOCUMENT
-    kdDebug () << "kpDocument::getPixmapFromFile(" << url << "," << tqparent << ")" << endl;
+    kdDebug () << "kpDocument::getPixmapFromFile(" << url << "," << parent << ")" << endl;
 #endif
 
     if (saveOptions)
@@ -247,11 +247,11 @@ TQPixmap kpDocument::getPixmapFromFile (const KURL &url, bool suppressDoesntExis
 
 
     TQString tempFile;
-    if (url.isEmpty () || !KIO::NetAccess::download (url, tempFile, tqparent))
+    if (url.isEmpty () || !KIO::NetAccess::download (url, tempFile, parent))
     {
         if (!suppressDoesntExistDialog)
         {
-            KMessageBox::sorry (tqparent,
+            KMessageBox::sorry (parent,
                                 i18n ("Could not open \"%1\".")
                                     .arg (kpDocument::prettyFilenameForURL (url)));
         }
@@ -277,7 +277,7 @@ TQPixmap kpDocument::getPixmapFromFile (const KURL &url, bool suppressDoesntExis
 
         if (detectedMimeType.isEmpty ())
         {
-            KMessageBox::sorry (tqparent,
+            KMessageBox::sorry (parent,
                                 i18n ("Could not open \"%1\" - unknown mimetype.")
                                     .arg (kpDocument::prettyFilenameForURL (url)));
             KIO::NetAccess::removeTempFile (tempFile);
@@ -292,7 +292,7 @@ TQPixmap kpDocument::getPixmapFromFile (const KURL &url, bool suppressDoesntExis
 
     if (image.isNull ())
     {
-        KMessageBox::sorry (tqparent,
+        KMessageBox::sorry (parent,
                             i18n ("Could not open \"%1\" - unsupported image format.\n"
                                   "The file may be corrupt.")
                                 .arg (kpDocument::prettyFilenameForURL (url)));
@@ -310,7 +310,7 @@ TQPixmap kpDocument::getPixmapFromFile (const KURL &url, bool suppressDoesntExis
 
                    " contains translucency which is not fully"
                    " supported. The translucency data will be"
-                   " approximated with a 1-bit transparency tqmask.")
+                   " approximated with a 1-bit transparency mask.")
                  .arg (prettyFilenameForURL (url)),
              i18n ("The image \"%1\""
                    " may have more colors than the current screen mode."
@@ -320,16 +320,16 @@ TQPixmap kpDocument::getPixmapFromFile (const KURL &url, bool suppressDoesntExis
              i18n ("The image \"%1\""
                    " contains translucency which is not fully"
                    " supported. The translucency data will be"
-                   " approximated with a 1-bit transparency tqmask.")
+                   " approximated with a 1-bit transparency mask.")
                 .arg (prettyFilenameForURL (url)),
             "docOpen",
-            tqparent),
+            parent),
         saveOptions,
         metaInfo);
 
     if (newPixmap.isNull ())
     {
-        KMessageBox::sorry (tqparent,
+        KMessageBox::sorry (parent,
                             i18n ("Could not open \"%1\" - out of graphics memory.")
                                 .arg (kpDocument::prettyFilenameForURL (url)));
         return TQPixmap ();
@@ -446,7 +446,7 @@ bool kpDocument::save (bool overwritePrompt, bool lossyPrompt)
 // public static
 bool kpDocument::lossyPromptContinue (const TQPixmap &pixmap,
                                       const kpDocumentSaveOptions &saveOptions,
-                                      TQWidget *tqparent)
+                                      TQWidget *parent)
 {
 #if DEBUG_KP_DOCUMENT
     kdDebug () << "kpDocument::lossyPromptContinue()" << endl;
@@ -465,7 +465,7 @@ bool kpDocument::lossyPromptContinue (const TQPixmap &pixmap,
                      kpDocumentSaveOptions::Quality))
     {
         TQUIT_IF_CANCEL (
-            KMessageBox::warningContinueCancel (tqparent,
+            KMessageBox::warningContinueCancel (parent,
                 i18n ("<qt><p>The <b>%1</b> format may not be able"
                       " to preserve all of the image's color information.</p>"
 
@@ -480,7 +480,7 @@ bool kpDocument::lossyPromptContinue (const TQPixmap &pixmap,
     else if (lossyType & kpDocumentSaveOptions::ColorDepthLow)
     {
         TQUIT_IF_CANCEL (
-            KMessageBox::warningContinueCancel (tqparent,
+            KMessageBox::warningContinueCancel (parent,
                 i18n ("<qt><p>Saving the image at the low color depth of %1-bit"
                         " may result in the loss of color information."
 
@@ -503,7 +503,7 @@ bool kpDocument::savePixmapToDevice (const TQPixmap &pixmap,
                                      const kpDocumentSaveOptions &saveOptions,
                                      const kpDocumentMetaInfo &metaInfo,
                                      bool lossyPrompt,
-                                     TQWidget *tqparent,
+                                     TQWidget *parent,
                                      bool *userCancelled)
 {
     if (userCancelled)
@@ -515,7 +515,7 @@ bool kpDocument::savePixmapToDevice (const TQPixmap &pixmap,
                << " type=" << type << endl;
 #endif
 
-    if (lossyPrompt && !lossyPromptContinue (pixmap, saveOptions, tqparent))
+    if (lossyPrompt && !lossyPromptContinue (pixmap, saveOptions, parent))
     {
         if (userCancelled)
             *userCancelled = true;
@@ -596,16 +596,16 @@ bool kpDocument::savePixmapToDevice (const TQPixmap &pixmap,
     return true;
 }
 
-static void CouldNotCreateTemporaryFileDialog (TQWidget *tqparent)
+static void CouldNotCreateTemporaryFileDialog (TQWidget *parent)
 {
-    KMessageBox::error (tqparent,
+    KMessageBox::error (parent,
                         i18n ("Could not save image - unable to create temporary file."));
 }
 
-static void CouldNotSaveDialog (const KURL &url, TQWidget *tqparent)
+static void CouldNotSaveDialog (const KURL &url, TQWidget *parent)
 {
     // TODO: use file.errorString()
-    KMessageBox::error (tqparent,
+    KMessageBox::error (parent,
                         i18n ("Could not save as \"%1\".")
                             .arg (kpDocument::prettyFilenameForURL (url)));
 }
@@ -617,7 +617,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
                                    const kpDocumentMetaInfo &metaInfo,
                                    bool overwritePrompt,
                                    bool lossyPrompt,
-                                   TQWidget *tqparent)
+                                   TQWidget *parent)
 {
     // TODO: Use KIO::NetAccess:mostLocalURL() for accessing home:/ (and other
     //       such local URLs) for efficiency and because only local writes
@@ -632,9 +632,9 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
     metaInfo.printDebug (TQString::tqfromLatin1 ("\tmetaInfo"));
 #endif
 
-    if (overwritePrompt && KIO::NetAccess::exists (url, false/*write*/, tqparent))
+    if (overwritePrompt && KIO::NetAccess::exists (url, false/*write*/, parent))
     {
-        int result = KMessageBox::warningContinueCancel (tqparent,
+        int result = KMessageBox::warningContinueCancel (parent,
             i18n ("A document called \"%1\" already exists.\n"
                   "Do you want to overwrite it?")
                 .arg (prettyFilenameForURL (url)),
@@ -652,7 +652,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
     }
 
 
-    if (lossyPrompt && !lossyPromptContinue (pixmap, saveOptions, tqparent))
+    if (lossyPrompt && !lossyPromptContinue (pixmap, saveOptions, parent))
     {
     #if DEBUG_KP_DOCUMENT
         kdDebug () << "\treturning false because of lossyPrompt" << endl;
@@ -681,7 +681,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
                 kdDebug () << "\treturning false because could not open KSaveFile"
                            << " status=" << atomicFileWriter.status () << endl;
             #endif
-                ::CouldNotCreateTemporaryFileDialog (tqparent);
+                ::CouldNotCreateTemporaryFileDialog (parent);
                 return false;
             }
 
@@ -689,7 +689,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
             if (!savePixmapToDevice (pixmap, TQT_TQIODEVICE(atomicFileWriter.file ()),
                                      saveOptions, metaInfo,
                                      false/*no lossy prompt*/,
-                                     tqparent))
+                                     parent))
             {
                 atomicFileWriter.abort ();
 
@@ -697,7 +697,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
                 kdDebug () << "\treturning false because could not save pixmap to device"
                             << endl;
             #endif
-                ::CouldNotSaveDialog (url, tqparent);
+                ::CouldNotSaveDialog (url, parent);
                 return false;
             }
 
@@ -710,7 +710,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
             #if DEBUG_KP_DOCUMENT
                 kdDebug () << "\tcould not close KSaveFile" << endl;
             #endif
-                ::CouldNotSaveDialog (url, tqparent);
+                ::CouldNotSaveDialog (url, parent);
                 return false;
             }
         }  // sync KSaveFile.abort()
@@ -729,7 +729,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
         #if DEBUG_KP_DOCUMENT
             kdDebug () << "\treturning false because tempFile empty" << endl;
         #endif
-            ::CouldNotCreateTemporaryFileDialog (tqparent);
+            ::CouldNotCreateTemporaryFileDialog (parent);
             return false;
         }
 
@@ -742,20 +742,20 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
                 kdDebug () << "\treturning false because can't open file"
                             << " errorString=" << file.errorString () << endl;
             #endif
-                ::CouldNotCreateTemporaryFileDialog (tqparent);
+                ::CouldNotCreateTemporaryFileDialog (parent);
                 return false;
             }
 
             if (!savePixmapToDevice (pixmap, TQT_TQIODEVICE(&file),
                                      saveOptions, metaInfo,
                                      false/*no lossy prompt*/,
-                                     tqparent))
+                                     parent))
             {
             #if DEBUG_KP_DOCUMENT
                 kdDebug () << "\treturning false because could not save pixmap to device"
                             << endl;
             #endif
-                ::CouldNotSaveDialog (url, tqparent);
+                ::CouldNotSaveDialog (url, parent);
                 return false;
             }
         }
@@ -765,7 +765,7 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
         #if DEBUG_KP_DOCUMENT
             kdDebug () << "\treturning false because could not close" << endl;
         #endif
-            ::CouldNotSaveDialog (url, tqparent);
+            ::CouldNotSaveDialog (url, parent);
             return false;
         }
 
@@ -773,12 +773,12 @@ bool kpDocument::savePixmapToFile (const TQPixmap &pixmap,
         // TODO: No one seems to know how to do this atomically
         //       [http://lists.kde.org/?l=kde-core-devel&m=117845162728484&w=2].
         //       At least, fish:// (ssh) is definitely not atomic.
-        if (!KIO::NetAccess::upload (filename, url, tqparent))
+        if (!KIO::NetAccess::upload (filename, url, parent))
         {
         #if DEBUG_KP_DOCUMENT
             kdDebug () << "\treturning false because could not upload" << endl;
         #endif
-            KMessageBox::error (tqparent,
+            KMessageBox::error (parent,
                                 i18n ("Could not save image - failed to upload."));
             return false;
         }
@@ -1267,7 +1267,7 @@ TQPixmap kpDocument::getSelectedPixmap (const TQBitmap &maskBitmap_) const
 
         if (maskBitmap.isNull ())
         {
-            kdError () << "kpDocument::getSelectedPixmap() could not get tqmask" << endl;
+            kdError () << "kpDocument::getSelectedPixmap() could not get mask" << endl;
             return TQPixmap ();
         }
     }
@@ -1325,7 +1325,7 @@ bool kpDocument::selectionPullFromDocument (const kpColor &backgroundColor)
 
 
     //
-    // Figure out tqmask for non-rectangular selections
+    // Figure out mask for non-rectangular selections
     //
 
     TQBitmap maskBitmap = sel->maskForOwnType (true/*return null bitmap for rectangular*/);
@@ -1355,8 +1355,8 @@ bool kpDocument::selectionPullFromDocument (const kpColor &backgroundColor)
         TQPixmap erasePixmap (boundingRect.width (), boundingRect.height ());
         erasePixmap.fill (backgroundColor.toTQColor ());
 
-        if (selTransparentPixmap.tqmask ())
+        if (selTransparentPixmap.mask ())
-            erasePixmap.setMask (*selTransparentPixmap.tqmask ());
+            erasePixmap.setMask (*selTransparentPixmap.mask ());
 
         paintPixmapAt (erasePixmap, boundingRect.topLeft ());
     }

kolourpaint/kpdocument.h

@@ -78,7 +78,7 @@ public:
         kpDocumentMetaInfo *metaInfo = 0);
 
     static TQPixmap getPixmapFromFile (const KURL &url, bool suppressDoesntExistDialog,
-                                      TQWidget *tqparent,
+                                      TQWidget *parent,
                                       kpDocumentSaveOptions *saveOptions = 0,
                                       kpDocumentMetaInfo *metaInfo = 0);
     // TODO: fix: open*() should only be called once.
@@ -88,13 +88,13 @@ public:
 
     static bool lossyPromptContinue (const TQPixmap &pixmap,
                                      const kpDocumentSaveOptions &saveOptions,
-                                     TQWidget *tqparent);
+                                     TQWidget *parent);
     static bool savePixmapToDevice (const TQPixmap &pixmap,
                                     TQIODevice *device,
                                     const kpDocumentSaveOptions &saveOptions,
                                     const kpDocumentMetaInfo &metaInfo,
                                     bool lossyPrompt,
-                                    TQWidget *tqparent,
+                                    TQWidget *parent,
                                     bool *userCancelled = 0);
     static bool savePixmapToFile (const TQPixmap &pixmap,
                                   const KURL &url,
@@ -102,7 +102,7 @@ public:
                                   const kpDocumentMetaInfo &metaInfo,
                                   bool overwritePrompt,
                                   bool lossyPrompt,
-                                  TQWidget *tqparent);
+                                  TQWidget *parent);
     bool save (bool overwritePrompt = false, bool lossyPrompt = false);
     bool saveAs (const KURL &url,
                  const kpDocumentSaveOptions &saveOptions,

kolourpaint/kpdocumentsaveoptions.cpp

@@ -545,7 +545,7 @@ int kpDocumentSaveOptions::isLossyForSaving (const TQPixmap &pixmap) const
     if (mimeTypeHasConfigurableColorDepth () &&
         !colorDepthIsInvalid () /*TODO: prevent*/ &&
         (colorDepth () < pixmap.depth () ||
-         colorDepth () < 32 && pixmap.tqmask ()))
+         colorDepth () < 32 && pixmap.mask ()))
     {
         ret |= ColorDepthLow;
     }

kolourpaint/kpdocumentsaveoptions.h

@@ -119,7 +119,7 @@ public:
     bool mimeTypeHasConfigurableQuality () const;
 
 
-    // TODO: checking for tqmask loss due to format e.g. BMP
+    // TODO: checking for mask loss due to format e.g. BMP
     enum LossyType
     {
         LossLess = 0,
@@ -127,7 +127,7 @@ public:
         // mimeTypeMaximumColorDepth() < <pixmap>.depth()
         MimeTypeMaximumColorDepthLow = 1,
         // i.e. colorDepth() < <pixmap>.depth() ||
-        //      colorDepth() < 32 && <pixmap>.tqmask()
+        //      colorDepth() < 32 && <pixmap>.mask()
         ColorDepthLow = 2,
         // i.e. mimeTypeHasConfigurableQuality()
         Quality = 4

kolourpaint/kpdocumentsaveoptionswidget.cpp

@@ -62,15 +62,15 @@ const TQSize kpDocumentSaveOptionsPreviewDialog::s_pixmapLabelMinimumSize (25, 2
 
 
 kpDocumentSaveOptionsPreviewDialog::kpDocumentSaveOptionsPreviewDialog (
-        TQWidget *tqparent,
+        TQWidget *parent,
         const char *name)
-    : TQWidget (tqparent, name,
+    : TQWidget (parent, name,
                TQt::WType_TopLevel |
                TQt::WStyle_Customize |
                    TQt::WStyle_DialogBorder |
                    TQt::WStyle_Title),
 #if 0
-KDialogBase (tqparent, name, false/*non-modal*/,
+KDialogBase (parent, name, false/*non-modal*/,
                    i18n ("Save Preview"),
                    0/*no buttons*/),
 #endif
@@ -270,9 +270,9 @@ kpDocumentSaveOptionsWidget::kpDocumentSaveOptionsWidget (
         const TQPixmap &docPixmap,
         const kpDocumentSaveOptions &saveOptions,
         const kpDocumentMetaInfo &metaInfo,
-        TQWidget *tqparent, const char *name)
+        TQWidget *parent, const char *name)
-    : TQWidget (tqparent, name),
+    : TQWidget (parent, name),
-      m_visualParent (tqparent)
+      m_visualParent (parent)
 {
     init ();
     setDocumentSaveOptions (saveOptions);
@@ -281,9 +281,9 @@ kpDocumentSaveOptionsWidget::kpDocumentSaveOptionsWidget (
 }
 
 kpDocumentSaveOptionsWidget::kpDocumentSaveOptionsWidget (
-        TQWidget *tqparent, const char *name)
+        TQWidget *parent, const char *name)
-    : TQWidget (tqparent, name),
+    : TQWidget (parent, name),
-      m_visualParent (tqparent)
+      m_visualParent (parent)
 {
     init ();
 }

kolourpaint/kpdocumentsaveoptionswidget.h

@@ -47,7 +47,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpDocumentSaveOptionsPreviewDialog (TQWidget *tqparent, const char *name = 0);
+    kpDocumentSaveOptionsPreviewDialog (TQWidget *parent, const char *name = 0);
     virtual ~kpDocumentSaveOptionsPreviewDialog ();
 
     TQSize preferredMinimumSize () const;
@@ -102,8 +102,8 @@ public:
     kpDocumentSaveOptionsWidget (const TQPixmap &docPixmap,
                                  const kpDocumentSaveOptions &saveOptions,
                                  const kpDocumentMetaInfo &metaInfo,
-                                 TQWidget *tqparent, const char *name = 0);
+                                 TQWidget *parent, const char *name = 0);
-    kpDocumentSaveOptionsWidget (TQWidget *tqparent, const char *name = 0);
+    kpDocumentSaveOptionsWidget (TQWidget *parent, const char *name = 0);
 private:
     void init ();
 public:

kolourpaint/kpmainwindow.cpp

@@ -64,7 +64,7 @@
 
 
 kpMainWindow::kpMainWindow ()
-    : KMainWindow (0/*tqparent*/, "mainWindow"),
+    : KMainWindow (0/*parent*/, "mainWindow"),
       m_isFullyConstructed (false)
 {
     init ();
@@ -74,7 +74,7 @@ kpMainWindow::kpMainWindow ()
 }
 
 kpMainWindow::kpMainWindow (const KURL &url)
-    : KMainWindow (0/*tqparent*/, "mainWindow"),
+    : KMainWindow (0/*parent*/, "mainWindow"),
       m_isFullyConstructed (false)
 {
     init ();
@@ -84,7 +84,7 @@ kpMainWindow::kpMainWindow (const KURL &url)
 }
 
 kpMainWindow::kpMainWindow (kpDocument *newDoc)
-    : KMainWindow (0/*tqparent*/, "mainWindow"),
+    : KMainWindow (0/*parent*/, "mainWindow"),
       m_isFullyConstructed (false)
 {
     init ();

kolourpaint/kpmainwindow_edit.cpp

@@ -72,7 +72,7 @@ kpPixmapFX::WarnAboutLossInfo kpMainWindow::pasteWarnAboutLossInfo ()
 
                      " contains translucency which is not fully"
                      " supported. The translucency data will be"
-                     " approximated with a 1-bit transparency tqmask."),
+                     " approximated with a 1-bit transparency mask."),
                i18n ("The image to be pasted"
                      " may have more colors than the current screen mode."
                      " In order to display it, some colors may be changed."
@@ -80,7 +80,7 @@ kpPixmapFX::WarnAboutLossInfo kpMainWindow::pasteWarnAboutLossInfo ()
                i18n ("The image to be pasted"
                      " contains translucency which is not fully"
                      " supported. The translucency data will be"
-                     " approximated with a 1-bit transparency tqmask."),
+                     " approximated with a 1-bit transparency mask."),
                "paste",
                this);
 }
@@ -215,7 +215,7 @@ void kpMainWindow::slotCopy ()
 
     kpSelection sel = *m_document->selection ();
     // Transparency doesn't get sent across the aether so nuke it now
-    // so that transparency tqmask doesn't get needlessly recalculated
+    // so that transparency mask doesn't get needlessly recalculated
     // if we ever call sel.setPixmap().
     sel.setTransparency (kpSelectionTransparency ());
 
@@ -256,12 +256,12 @@ void kpMainWindow::slotCopy ()
         else
             rawPixmap = m_document->getSelectedPixmap ();
         
-        // Some apps, such as OpenOffice.org 2.0.4, ignore the image tqmask
+        // Some apps, such as OpenOffice.org 2.0.4, ignore the image mask
         // when pasting.  For transparent pixels, the uninitialized RGB
         // values are used.  Fix this by initializing those values to a
         // neutral color -- white.
         //
-        // Strangely enough, OpenOffice.org respects the tqmask when inserting
+        // Strangely enough, OpenOffice.org respects the mask when inserting
         // an image from a file, as opposed to pasting one from the clipboard.
         sel.setPixmap (
             kpPixmapFX::pixmapWithDefinedTransparentPixels (

kolourpaint/kpmainwindow_file.cpp

@@ -1224,7 +1224,7 @@ void kpMainWindow::slotPrintPreview ()
     // TODO: get it to reflect default printer's settings
     KPrinter printer (false/*separate settings from ordinary printer*/);
 
-    // TODO: pass "this" as tqparent
+    // TODO: pass "this" as parent
     printer.setPreviewOnly (true);
 
     sendPixmapToPrinter (&printer, false/*don't showPrinterSetupDialog*/);

kolourpaint/kpmainwindow_settings.cpp

@@ -170,7 +170,7 @@ void kpMainWindow::slotConfigureToolBars ()
     KEditToolbar dialog (actionCollection (),
                          TQString()/*default ui.rc file*/,
                          true/*global resource*/,
-                         this/*tqparent*/);
+                         this/*parent*/);
     // Clicking on OK after Apply brings up the dialog (below) again.
     // Bug with KEditToolBar.
     dialog.showButtonApply (false);

kolourpaint/kpselection.cpp

@@ -685,7 +685,7 @@ void kpSelection::paintOpaqueText (TQPixmap *destPixmap, const TQRect &docRect)
     TQBitmap destPixmapMask;
     TQPainter destPixmapPainter, destPixmapMaskPainter;
 
-    if (destPixmap->tqmask ())
+    if (destPixmap->mask ())
     {
         if (m_textStyle.effectiveBackgroundColor ().isTransparent ())
         {
@@ -701,7 +701,7 @@ void kpSelection::paintOpaqueText (TQPixmap *destPixmap, const TQRect &docRect)
                     m_textStyle.foregroundColor ().toTQColor ()));
         }
 
-        destPixmapMask = *destPixmap->tqmask ();
+        destPixmapMask = *destPixmap->mask ();
         destPixmapMaskPainter.begin (&destPixmapMask);
         destPixmapMaskPainter.translate (-docRect.x (), -docRect.y ());
         destPixmapMaskPainter.setPen (TQt::color1/*opaque*/);
@@ -782,7 +782,7 @@ TQPixmap kpSelection::transparentForegroundTextPixmap () const
     // TQt::color0/*transparent*/ (but TQt::color1 seems Ok).
     // So we draw in a contrasting color to the background so that
     // we can identify the transparent pixels for manually creating
-    // the tqmask.
+    // the mask.
     pixmapPainter.setPen (
         TQColor (mostContrastingRGB (m_textStyle.effectiveBackgroundColor ().toTQRgb () & TQRGB_MASK)));
     pixmapPainter.setFont (font);
@@ -1252,7 +1252,7 @@ void kpSelection::calculateTransparencyMask ()
     if (isText ())
     {
     #if DEBUG_KP_SELECTION
-        kdDebug () << "\ttext - no need for transparency tqmask" << endl;
+        kdDebug () << "\ttext - no need for transparency mask" << endl;
     #endif
         m_transparencyMask.resize (0, 0);
         return;
@@ -1261,7 +1261,7 @@ void kpSelection::calculateTransparencyMask ()
     if (!m_pixmap)
     {
     #if DEBUG_KP_SELECTION
-        kdDebug () << "\tno pixmap - no need for transparency tqmask" << endl;
+        kdDebug () << "\tno pixmap - no need for transparency mask" << endl;
     #endif
         m_transparencyMask.resize (0, 0);
         return;
@@ -1270,7 +1270,7 @@ void kpSelection::calculateTransparencyMask ()
     if (m_transparency.isOpaque ())
     {
     #if DEBUG_KP_SELECTION
-        kdDebug () << "\topaque - no need for transparency tqmask" << endl;
+        kdDebug () << "\topaque - no need for transparency mask" << endl;
     #endif
         m_transparencyMask.resize (0, 0);
         return;
@@ -1433,7 +1433,7 @@ void kpSelection::flip (bool horiz, bool vert)
     if (!m_transparencyMask.isNull ())
     {
     #if DEBUG_KP_SELECTION && 1
-        kdDebug () << "\thave transparency tqmask - flipping that" << endl;
+        kdDebug () << "\thave transparency mask - flipping that" << endl;
     #endif
         kpPixmapFX::flip (TQT_TQPIXMAP(&m_transparencyMask), horiz, vert);
     }

kolourpaint/kpsinglekeytriggersaction.cpp

@@ -119,8 +119,8 @@ void kpSingleKeyTriggersActionInterface::enableSingleKeyTriggers (bool enable)
 kpSingleKeyTriggersAction::kpSingleKeyTriggersAction (const TQString &text,
                             const KShortcut &shortcut,
                             const TQObject *receiver, const char *slot,
-                            KActionCollection *tqparent, const char *name)
+                            KActionCollection *parent, const char *name)
-    : KAction (text, shortcut, receiver, slot, tqparent, name)
+    : KAction (text, shortcut, receiver, slot, parent, name)
 {
 }
 

kolourpaint/kpsinglekeytriggersaction.h

@@ -66,7 +66,7 @@ public:
     kpSingleKeyTriggersAction (const TQString &text,
                                const KShortcut &shortcut,
                                const TQObject *receiver, const char *slot,
-                               KActionCollection *tqparent, const char *name);
+                               KActionCollection *parent, const char *name);
     virtual ~kpSingleKeyTriggersAction ();
 
 

kolourpaint/kptemppixmap.h

@@ -69,7 +69,7 @@ public:
     int height () const;
 
 
-    // Returns whether a call to paint() may change <*destPixmap>'s tqmask
+    // Returns whether a call to paint() may change <*destPixmap>'s mask
     bool mayChangeDocumentMask () const;
 
     /*

kolourpaint/kpthumbnail.cpp

@@ -45,21 +45,21 @@
 
 
 // TODO: get out of the Alt+Tab list
-kpThumbnail::kpThumbnail (kpMainWindow *tqparent, const char *name)
+kpThumbnail::kpThumbnail (kpMainWindow *parent, const char *name)
-    : TQDockWindow (TQDockWindow::OutsideDock, tqparent, name),
+    : TQDockWindow (TQDockWindow::OutsideDock, parent, name),
-      m_mainWindow (tqparent),
+      m_mainWindow (parent),
       m_view (0)
 {
-    if (!tqparent)
+    if (!parent)
-        kdError () << "kpThumbnail::kpThumbnail() requires tqparent" << endl;
+        kdError () << "kpThumbnail::kpThumbnail() requires parent" << endl;
 
-    if (tqparent)
+    if (parent)
     {
         // Prevent thumbnail from docking - it's _really_ irritating otherwise
-        tqparent->leftDock ()->setAcceptDockWindow (this, false);
+        parent->leftDock ()->setAcceptDockWindow (this, false);
-        tqparent->rightDock ()->setAcceptDockWindow (this, false);
+        parent->rightDock ()->setAcceptDockWindow (this, false);
-        tqparent->topDock ()->setAcceptDockWindow (this, false);
+        parent->topDock ()->setAcceptDockWindow (this, false);
-        tqparent->bottomDock ()->setAcceptDockWindow (this, false);
+        parent->bottomDock ()->setAcceptDockWindow (this, false);
     }
 
 

kolourpaint/kpthumbnail.h

@@ -41,7 +41,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpThumbnail (kpMainWindow *tqparent, const char *name = 0);
+    kpThumbnail (kpMainWindow *parent, const char *name = 0);
     virtual ~kpThumbnail ();
 
 public:

kolourpaint/kptool.cpp

@@ -1618,7 +1618,7 @@ bool kpTool::warnIfBigImageSize (int oldWidth, int oldHeight,
                                  const TQString &text,
                                  const TQString &caption,
                                  const TQString &continueButtonText,
-                                 TQWidget *tqparent)
+                                 TQWidget *parent)
 {
 #if DEBUG_KP_TOOL
     kdDebug () << "kpTool::warnIfBigImageSize()"
@@ -1648,7 +1648,7 @@ bool kpTool::warnIfBigImageSize (int oldWidth, int oldHeight,
     if (kpPixmapFX::pixmapSize (newWidth, newHeight, TQPixmap::defaultDepth ()) >=
         KP_BIG_IMAGE_SIZE)
     {
-        int accept = KMessageBox::warningContinueCancel (tqparent,
+        int accept = KMessageBox::warningContinueCancel (parent,
             text,
             caption,
             continueButtonText,

kolourpaint/kptool.h

@@ -410,7 +410,7 @@ public:
                                     const TQString &text,
                                     const TQString &caption,
                                     const TQString &continueButtonText,
-                                    TQWidget *tqparent);
+                                    TQWidget *parent);
 
 
 protected:

kolourpaint/kpview.cpp

@@ -102,9 +102,9 @@ kpView::kpView (kpDocument *document,
         kpViewManager *viewManager,
         kpView *buddyView,
         kpViewScrollableContainer *scrollableContainer,
-        TQWidget *tqparent, const char *name)
+        TQWidget *parent, const char *name)
 
-    : TQWidget (tqparent, name, TQt::WNoAutoErase/*no flicker*/),
+    : TQWidget (parent, name, TQt::WNoAutoErase/*no flicker*/),
       d (new kpViewPrivate ())
 {
     d->m_document = document;
@@ -1348,9 +1348,9 @@ void kpView::paintEventDrawSelection (TQPixmap *destPixmap, const TQRect &docRec
 
         TQBitmap maskBitmap;
         TQPainter maskBitmapPainter;
-        if (destPixmap->tqmask ())
+        if (destPixmap->mask ())
         {
-            maskBitmap = *destPixmap->tqmask ();
+            maskBitmap = *destPixmap->mask ();
             maskBitmapPainter.begin (&maskBitmap);
             maskBitmapPainter.setPen (TQt::color1/*opaque*/);
         }
@@ -1483,9 +1483,9 @@ void kpView::paintEventDrawSelection (TQPixmap *destPixmap, const TQRect &docRec
                 TQBitmap maskBitmap;
                 TQPainter destPixmapPainter, maskBitmapPainter;
 
-                if (destPixmap->tqmask ())
+                if (destPixmap->mask ())
                 {
-                    maskBitmap = *destPixmap->tqmask ();
+                    maskBitmap = *destPixmap->mask ();
                     maskBitmapPainter.begin (&maskBitmap);
                     maskBitmapPainter.fillRect (rect, TQt::color1/*opaque*/);
                     maskBitmapPainter.end ();
@@ -1747,11 +1747,11 @@ void kpView::paintEventDrawRect (const TQRect &viewRect)
     #endif
     }
 
-    if (docPixmap.tqmask () ||
+    if (docPixmap.mask () ||
         (tempPixmapWillBeRendered && vm->tempPixmap ()->mayChangeDocumentMask ()))
     {
     #if DEBUG_KP_VIEW_RENDERER && 1
-        kdDebug () << "\ttqmask=" << (bool) docPixmap.tqmask ()
+        kdDebug () << "\tmask=" << (bool) docPixmap.mask ()
                    << endl;
     #endif
         paintEventDrawCheckerBoard (&backBufferPainter, viewRect);
@@ -1759,7 +1759,7 @@ void kpView::paintEventDrawRect (const TQRect &viewRect)
     else
     {
     #if DEBUG_KP_VIEW_RENDERER && 1
-        kdDebug () << "\tno tqmask" << endl;
+        kdDebug () << "\tno mask" << endl;
     #endif
     }
 

kolourpaint/kpview.h

@@ -81,7 +81,7 @@ public:
             kpViewManager *viewManager,
             kpView *buddyView,
             kpViewScrollableContainer *scrollableContainer,
-            TQWidget *tqparent, const char *name);
+            TQWidget *parent, const char *name);
 
     /**
      * Destructs this view.  Informs the viewManager() that the mouse
@@ -344,7 +344,7 @@ protected:
 public:
     /**
      * Adds a region (in view coordinates) to the dirty area that is
-     * repainted when the tqparent @ref kpViewManager is set not to queue
+     * repainted when the parent @ref kpViewManager is set not to queue
      * updates.
      *
      * @param region Region (in view coordinates) that needs repainting.
@@ -355,7 +355,7 @@ public:
      * Convenience function.  Same as above.
      *
      * Adds a rectangle (in view coordinates) to the dirty area that is
-     * repainted when the tqparent @ref kpViewManager is set not to queue
+     * repainted when the parent @ref kpViewManager is set not to queue
      * updates.
      *
      * @param rect Rectangle (in view coordinates) that needs repainting.

kolourpaint/kpviewscrollablecontainer.cpp

@@ -58,8 +58,8 @@ static const int GripHandleSize = 7;
 
 
 kpGrip::kpGrip (GripType type,
-                TQWidget *tqparent, const char *name)
+                TQWidget *parent, const char *name)
-    : TQWidget (tqparent, name),
+    : TQWidget (parent, name),
       m_type (type),
       m_startPoint (KP_INVALID_POINT),
       m_currentPoint (KP_INVALID_POINT),
@@ -166,7 +166,7 @@ TQString kpGrip::userMessage () const
 void kpGrip::setUserMessage (const TQString &message)
 {
     // Don't do NOP checking here since another grip might have changed
-    // the message so an aptqparent NOP for this grip is not a NOP in the
+    // the message so an apparent NOP for this grip is not a NOP in the
     // global sense (kpViewScrollableContainer::slotGripStatusMessageChanged()).
 
     m_userMessage = message;
@@ -194,8 +194,8 @@ void kpGrip::updatePixmap ()
         kpPixmapFX::ensureOpaqueAt (&pixmap, hr);
 
     setBackgroundPixmap (pixmap);
-    if (pixmap.tqmask ())
+    if (pixmap.mask ())
-        setMask (*pixmap.tqmask ());
+        setMask (*pixmap.mask ());
 }
 
 
@@ -390,10 +390,10 @@ void kpGrip::paintEvent (TQPaintEvent *e)
 
 
 // TODO: Are we checking for m_view == 0 often enough?
-kpViewScrollableContainer::kpViewScrollableContainer (kpMainWindow *tqparent,
+kpViewScrollableContainer::kpViewScrollableContainer (kpMainWindow *parent,
                                                       const char *name)
-    : TQScrollView ((TQWidget *) tqparent, name, TQt::WStaticContents | TQt::WNoAutoErase),
+    : TQScrollView ((TQWidget *) parent, name, TQt::WStaticContents | TQt::WNoAutoErase),
-      m_mainWindow (tqparent),
+      m_mainWindow (parent),
       m_contentsXSoon (-1), m_contentsYSoon (-1),
       m_view (0),
       m_bottomGrip (new kpGrip (kpGrip::Bottom, viewport (), "Bottom Grip")),

kolourpaint/kpviewscrollablecontainer.h

@@ -58,7 +58,7 @@ public:
     };
 
     kpGrip (GripType type,
-            TQWidget *tqparent, const char *name = 0);
+            TQWidget *parent, const char *name = 0);
     virtual ~kpGrip ();
 
     GripType type () const;
@@ -119,7 +119,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpViewScrollableContainer (kpMainWindow *tqparent, const char *name = 0);
+    kpViewScrollableContainer (kpMainWindow *parent, const char *name = 0);
     virtual ~kpViewScrollableContainer ();
 
     // Same as contentsX() and contentsY() except that after

kolourpaint/pixmapfx/kpcoloreffect.cpp

@@ -133,8 +133,8 @@ void kpColorEffectCommand::unexecute ()
 
 kpColorEffectWidget::kpColorEffectWidget (bool actOnSelection,
                                           kpMainWindow *mainWindow,
-                                          TQWidget *tqparent, const char *name)
+                                          TQWidget *parent, const char *name)
-    : TQWidget (tqparent, name),
+    : TQWidget (parent, name),
       m_actOnSelection (actOnSelection),
       m_mainWindow (mainWindow)
 {

kolourpaint/pixmapfx/kpcoloreffect.h

@@ -79,7 +79,7 @@ Q_OBJECT
 public:
     kpColorEffectWidget (bool actOnSelection,
                          kpMainWindow *mainWindow,
-                         TQWidget *tqparent, const char *name = 0);
+                         TQWidget *parent, const char *name = 0);
     virtual ~kpColorEffectWidget ();
 
 signals:

kolourpaint/pixmapfx/kpeffectbalance.cpp

@@ -253,8 +253,8 @@ TQPixmap kpEffectBalanceCommand::applyColorEffect (const TQPixmap &pixmap)
 
 kpEffectBalanceWidget::kpEffectBalanceWidget (bool actOnSelection,
                                               kpMainWindow *mainWindow,
-                                              TQWidget *tqparent, const char *name)
+                                              TQWidget *parent, const char *name)
-    : kpColorEffectWidget (actOnSelection, mainWindow, tqparent, name)
+    : kpColorEffectWidget (actOnSelection, mainWindow, parent, name)
 {
     TQGridLayout *lay = new TQGridLayout (this, 5, 5, marginHint (), spacingHint ());
 

kolourpaint/pixmapfx/kpeffectbalance.h

@@ -79,7 +79,7 @@ Q_OBJECT
 public:
     kpEffectBalanceWidget (bool actOnSelection,
                            kpMainWindow *mainWindow,
-                           TQWidget *tqparent, const char *name = 0);
+                           TQWidget *parent, const char *name = 0);
     virtual ~kpEffectBalanceWidget ();
 
     virtual TQString caption () const;

kolourpaint/pixmapfx/kpeffectblursharpen.cpp

@@ -88,7 +88,7 @@ TQPixmap kpEffectBlurSharpenCommand::apply (const TQPixmap &pixmap,
                << endl;
 #endif
 
-    // (KImageEffect::(blur|sharpen)() ignores tqmask)
+    // (KImageEffect::(blur|sharpen)() ignores mask)
     TQPixmap usePixmap = kpPixmapFX::pixmapWithDefinedTransparentPixels (
         pixmap,
         TQt::white/*arbitrarily chosen*/);
@@ -107,9 +107,9 @@ TQPixmap kpEffectBlurSharpenCommand::apply (const TQPixmap &pixmap,
     TQPixmap retPixmap = kpPixmapFX::convertToPixmap (image);
 
 
-    // KImageEffect::(blur|sharpen)() nukes tqmask - restore it
+    // KImageEffect::(blur|sharpen)() nukes mask - restore it
-    if (usePixmap.tqmask ())
+    if (usePixmap.mask ())
-        retPixmap.setMask (*usePixmap.tqmask ());
+        retPixmap.setMask (*usePixmap.mask ());
 
 
     return retPixmap;
@@ -125,8 +125,8 @@ TQPixmap kpEffectBlurSharpenCommand::applyColorEffect (const TQPixmap &pixmap)
 
 kpEffectBlurSharpenWidget::kpEffectBlurSharpenWidget (bool actOnSelection,
                                                       kpMainWindow *mainWindow,
-                                                      TQWidget *tqparent, const char *name)
+                                                      TQWidget *parent, const char *name)
-    : kpColorEffectWidget (actOnSelection, mainWindow, tqparent, name)
+    : kpColorEffectWidget (actOnSelection, mainWindow, parent, name)
 {
     TQGridLayout *lay = new TQGridLayout (this, 4, 2, marginHint (), spacingHint ());
 

kolourpaint/pixmapfx/kpeffectblursharpen.h

@@ -79,7 +79,7 @@ Q_OBJECT
 public:
     kpEffectBlurSharpenWidget (bool actOnSelection,
                                kpMainWindow *mainWindow,
-                               TQWidget *tqparent, const char *name = 0);
+                               TQWidget *parent, const char *name = 0);
     virtual ~kpEffectBlurSharpenWidget ();
 
     virtual TQString caption () const;

kolourpaint/pixmapfx/kpeffectemboss.cpp

@@ -75,7 +75,7 @@ TQPixmap kpEffectEmbossCommand::apply (const TQPixmap &pixmap,
                << endl;
 #endif
 
-    // (KImageEffect::emboss() ignores tqmask)
+    // (KImageEffect::emboss() ignores mask)
     TQPixmap usePixmap = kpPixmapFX::pixmapWithDefinedTransparentPixels (
         pixmap,
         TQt::white/*arbitrarily chosen*/);
@@ -91,9 +91,9 @@ TQPixmap kpEffectEmbossCommand::apply (const TQPixmap &pixmap,
     TQPixmap retPixmap = kpPixmapFX::convertToPixmap (image);
 
 
-    // KImageEffect::emboss() nukes tqmask - restore it
+    // KImageEffect::emboss() nukes mask - restore it
-    if (usePixmap.tqmask ())
+    if (usePixmap.mask ())
-        retPixmap.setMask (*usePixmap.tqmask ());
+        retPixmap.setMask (*usePixmap.mask ());
 
 
     return retPixmap;
@@ -109,8 +109,8 @@ TQPixmap kpEffectEmbossCommand::applyColorEffect (const TQPixmap &pixmap)
 
 kpEffectEmbossWidget::kpEffectEmbossWidget (bool actOnSelection,
                                             kpMainWindow *mainWindow,
-                                            TQWidget *tqparent, const char *name)
+                                            TQWidget *parent, const char *name)
-    : kpColorEffectWidget (actOnSelection, mainWindow, tqparent, name)
+    : kpColorEffectWidget (actOnSelection, mainWindow, parent, name)
 {
     TQGridLayout *lay = new TQGridLayout (this, 4, 2, marginHint (), spacingHint ());
 

kolourpaint/pixmapfx/kpeffectemboss.h

@@ -71,7 +71,7 @@ Q_OBJECT
 public:
     kpEffectEmbossWidget (bool actOnSelection,
                           kpMainWindow *mainWindow,
-                          TQWidget *tqparent, const char *name = 0);
+                          TQWidget *parent, const char *name = 0);
     virtual ~kpEffectEmbossWidget ();
 
     virtual TQString caption () const;

kolourpaint/pixmapfx/kpeffectflatten.cpp

@@ -131,9 +131,9 @@ TQColor kpEffectFlattenWidget::s_lastColor2;
 
 kpEffectFlattenWidget::kpEffectFlattenWidget (bool actOnSelection,
                                               kpMainWindow *mainWindow,
-                                              TQWidget *tqparent,
+                                              TQWidget *parent,
                                               const char *name)
-    : kpColorEffectWidget (actOnSelection, mainWindow, tqparent, name)
+    : kpColorEffectWidget (actOnSelection, mainWindow, parent, name)
 {
     if (!s_lastColor1.isValid () || !s_lastColor2.isValid ())
     {

kolourpaint/pixmapfx/kpeffectflatten.h

@@ -81,7 +81,7 @@ Q_OBJECT
 public:
     kpEffectFlattenWidget (bool actOnSelection,
                            kpMainWindow *mainWindow,
-                           TQWidget *tqparent, const char *name = 0);
+                           TQWidget *parent, const char *name = 0);
     virtual ~kpEffectFlattenWidget ();
 
 

kolourpaint/pixmapfx/kpeffectinvert.cpp

@@ -86,13 +86,13 @@ TQPixmap kpEffectInvertCommand::apply (const TQPixmap &pm, int channels)
 // public static
 void kpEffectInvertCommand::apply (TQImage *destImagePtr, int channels)
 {
-    TQRgb tqmask = tqRgba ((channels & Red) ? 0xFF : 0,
+    TQRgb mask = tqRgba ((channels & Red) ? 0xFF : 0,
                        (channels & Green) ? 0xFF : 0,
                        (channels & Blue) ? 0xFF : 0,
                        0/*don't invert alpha*/);
 #if DEBUG_KP_EFFECT_INVERT
     kdDebug () << "kpEffectInvertCommand::apply(channels=" << channels
-               << ") tqmask=" << (int *) tqmask
+               << ") mask=" << (int *) mask
                << endl;
 #endif
 
@@ -109,7 +109,7 @@ void kpEffectInvertCommand::apply (TQImage *destImagePtr, int channels)
         {
             for (int x = 0; x < destImagePtr->width (); x++)
             {
-                destImagePtr->setPixel (x, y, destImagePtr->pixel (x, y) ^ tqmask);
+                destImagePtr->setPixel (x, y, destImagePtr->pixel (x, y) ^ mask);
             }
         }
     #endif
@@ -118,7 +118,7 @@ void kpEffectInvertCommand::apply (TQImage *destImagePtr, int channels)
     {
         for (int i = 0; i < destImagePtr->numColors (); i++)
         {
-            destImagePtr->setColor (i, destImagePtr->color (i) ^ tqmask);
+            destImagePtr->setColor (i, destImagePtr->color (i) ^ mask);
         }
     }
 }
@@ -149,9 +149,9 @@ TQPixmap kpEffectInvertCommand::applyColorEffect (const TQPixmap &pixmap)
 
 kpEffectInvertWidget::kpEffectInvertWidget (bool actOnSelection,
                                             kpMainWindow *mainWindow,
-                                            TQWidget *tqparent,
+                                            TQWidget *parent,
                                             const char *name)
-    : kpColorEffectWidget (actOnSelection, mainWindow, tqparent, name)
+    : kpColorEffectWidget (actOnSelection, mainWindow, parent, name)
 {
     TQVBoxLayout *topLevelLay = new TQVBoxLayout (this, marginHint (), spacingHint ());
 

kolourpaint/pixmapfx/kpeffectinvert.h

@@ -96,7 +96,7 @@ Q_OBJECT
 public:
     kpEffectInvertWidget (bool actOnSelection,
                           kpMainWindow *mainWindow,
-                          TQWidget *tqparent, const char *name = 0);
+                          TQWidget *parent, const char *name = 0);
     virtual ~kpEffectInvertWidget ();
 
 

kolourpaint/pixmapfx/kpeffectreducecolors.cpp

@@ -242,10 +242,10 @@ void kpEffectReduceColorsCommand::apply (TQPixmap *destPixmapPtr, int depth, boo
     //       (at least for monochrome).
     //       tqpixmap.html says "alpha masks on monochrome images are ignored."
     //
-    //       Put the tqmask back.
+    //       Put the mask back.
     //
-    if (destPixmapPtr->tqmask ())
+    if (destPixmapPtr->mask ())
-        pixmap.setMask (*destPixmapPtr->tqmask ());
+        pixmap.setMask (*destPixmapPtr->mask ());
 
     *destPixmapPtr = pixmap;
 }
@@ -276,9 +276,9 @@ TQPixmap kpEffectReduceColorsCommand::applyColorEffect (const TQPixmap &pixmap)
 
 kpEffectReduceColorsWidget::kpEffectReduceColorsWidget (bool actOnSelection,
                                                         kpMainWindow *mainWindow,
-                                                        TQWidget *tqparent,
+                                                        TQWidget *parent,
                                                         const char *name)
-    : kpColorEffectWidget (actOnSelection, mainWindow, tqparent, name)
+    : kpColorEffectWidget (actOnSelection, mainWindow, parent, name)
 {
     TQVBoxLayout *lay = new TQVBoxLayout (this, marginHint (), spacingHint ());
 

kolourpaint/pixmapfx/kpeffectreducecolors.h

@@ -53,7 +53,7 @@ public:
 
     TQString commandName (int depth, int dither) const;
 
-    // (always preserves tqmask)
+    // (always preserves mask)
     static void apply (TQPixmap *destPixmapPtr, int depth, bool dither);
     static TQPixmap apply (const TQPixmap &pm, int depth, bool dither);
 
@@ -78,7 +78,7 @@ Q_OBJECT
 public:
     kpEffectReduceColorsWidget (bool actOnSelection,
                                 kpMainWindow *mainWindow,
-                                TQWidget *tqparent, const char *name = 0);
+                                TQWidget *parent, const char *name = 0);
     virtual ~kpEffectReduceColorsWidget ();
 
 

kolourpaint/pixmapfx/kpeffectsdialog.cpp

@@ -59,14 +59,14 @@ int kpEffectsDialog::s_lastHeight = 620;
 
 
 kpEffectsDialog::kpEffectsDialog (bool actOnSelection,
-                                  kpMainWindow *tqparent,
+                                  kpMainWindow *parent,
                                   const char *name)
     : kpToolPreviewDialog (kpToolPreviewDialog::Preview,
                            true/*reserve top row*/,
                            TQString()/*caption*/,
                            TQString()/*afterActionText (no Dimensions Group Box)*/,
                            actOnSelection,
-                           tqparent,
+                           parent,
                            name),
       m_delayedUpdateTimer (new TQTimer (this)),
       m_effectsComboBox (0),

kolourpaint/pixmapfx/kpeffectsdialog.h

@@ -52,7 +52,7 @@ Q_OBJECT
 
 public:
     kpEffectsDialog (bool actOnSelection,
-                     kpMainWindow *tqparent,
+                     kpMainWindow *parent,
                      const char *name = 0);
     virtual ~kpEffectsDialog ();
 

kolourpaint/pixmapfx/kpfloodfill.cpp

@@ -100,7 +100,7 @@ bool kpFloodFill::fill ()
         TQPainter painter, maskPainter;
         TQBitmap maskBitmap;
 
-        if (m_pixmapPtr->tqmask () || m_color.isTransparent ())
+        if (m_pixmapPtr->mask () || m_color.isTransparent ())
         {
             maskBitmap = kpPixmapFX::getNonNullMask (*m_pixmapPtr);
             maskPainter.begin (&maskBitmap);

kolourpaint/pixmapfx/kppixmapfx.cpp

@@ -556,7 +556,7 @@ TQPixmap kpPixmapFX::convertToPixmapAsLosslessAsPossible (const TQImage &image,
 TQPixmap kpPixmapFX::pixmapWithDefinedTransparentPixels (const TQPixmap &pixmap,
                                                         const TQColor &transparentColor)
 {
-    if (!pixmap.tqmask ())
+    if (!pixmap.mask ())
         return pixmap;
 
     TQPixmap retPixmap (pixmap.width (), pixmap.height ());
@@ -566,7 +566,7 @@ TQPixmap kpPixmapFX::pixmapWithDefinedTransparentPixels (const TQPixmap &pixmap,
     p.drawPixmap (TQPoint (0, 0), pixmap);
     p.end ();
 
-    retPixmap.setMask (*pixmap.tqmask ());
+    retPixmap.setMask (*pixmap.mask ());
     return retPixmap;
 }
 
@@ -583,7 +583,7 @@ TQPixmap kpPixmapFX::getPixmapAt (const TQPixmap &pm, const TQRect &rect)
 
 #if DEBUG_KP_PIXMAP_FX && 0
     kdDebug () << "kpPixmapFX::getPixmapAt(pm.hasMask="
-               << (pm.tqmask () ? 1 : 0)
+               << (pm.mask () ? 1 : 0)
                << ",rect="
                << rect
                << ")"
@@ -614,14 +614,14 @@ TQPixmap kpPixmapFX::getPixmapAt (const TQPixmap &pm, const TQRect &rect)
 
     const TQPoint destTopLeft = validSrcRect.topLeft () - rect.topLeft ();
 
-    // copy data _and_ tqmask (if avail)
+    // copy data _and_ mask (if avail)
     copyBlt (&retPixmap, /* dest */
              destTopLeft.x (), destTopLeft.y (), /* dest pt */
              &pm, /* src */
              validSrcRect.x (), validSrcRect.y (), /* src pt */
              validSrcRect.width (), validSrcRect.height ());
 
-    if (wouldHaveUndefinedPixels && retPixmap.tqmask () && !pm.tqmask ())
+    if (wouldHaveUndefinedPixels && retPixmap.mask () && !pm.mask ())
     {
     #if DEBUG_KP_PIXMAP_FX && 0
         kdDebug () << "\tensure opaque in valid region" << endl;
@@ -633,7 +633,7 @@ TQPixmap kpPixmapFX::getPixmapAt (const TQPixmap &pm, const TQRect &rect)
 
 #if DEBUG_KP_PIXMAP_FX && 0
     kdDebug () << "\tretPixmap.hasMask="
-               << (retPixmap.tqmask () ? 1 : 0)
+               << (retPixmap.mask () ? 1 : 0)
                << endl;
 #endif
 
@@ -652,19 +652,19 @@ void kpPixmapFX::setPixmapAt (TQPixmap *destPixmapPtr, const TQRect &destRect,
     kdDebug () << "kpPixmapFX::setPixmapAt(destPixmap->rect="
                << destPixmapPtr->rect ()
                << ",destPixmap->hasMask="
-               << (destPixmapPtr->tqmask () ? 1 : 0)
+               << (destPixmapPtr->mask () ? 1 : 0)
                << ",destRect="
                << destRect
                << ",srcPixmap.rect="
                << srcPixmap.rect ()
                << ",srcPixmap.hasMask="
-               << (srcPixmap.tqmask () ? 1 : 0)
+               << (srcPixmap.mask () ? 1 : 0)
                << ")"
                << endl;
 #endif
 
 #if DEBUG_KP_PIXMAP_FX && 0
-    if (destPixmapPtr->tqmask ())
+    if (destPixmapPtr->mask ())
     {
         TQImage image = kpPixmapFX::convertToImage (*destPixmapPtr);
         int numTrans = 0;
@@ -687,7 +687,7 @@ void kpPixmapFX::setPixmapAt (TQPixmap *destPixmapPtr, const TQRect &destRect,
     //       result in a opaque image, except for that single transparent pixel???
     //       TQt bug on boundary case?
 
-    // copy data _and_ tqmask
+    // copy data _and_ mask
     copyBlt (destPixmapPtr,
              destAt.x (), destAt.y (),
              &srcPixmap,
@@ -700,23 +700,23 @@ void kpPixmapFX::setPixmapAt (TQPixmap *destPixmapPtr, const TQRect &destRect,
             0, 0,
             destRect.width (), destRect.height (),
             TQt::CopyROP,
-            true/*ignore tqmask*/);
+            true/*ignore mask*/);
 
-    if (srcPixmap.tqmask ())
+    if (srcPixmap.mask ())
     {
-        TQBitmap tqmask = getNonNullMask (*destPixmapPtr);
+        TQBitmap mask = getNonNullMask (*destPixmapPtr);
-        bitBlt (TQT_TQPAINTDEVICE(&tqmask),
+        bitBlt (TQT_TQPAINTDEVICE(&mask),
                 destRect.x (), destRect.y (),
-                TQT_TQPAINTDEVICE(const_cast<TQBitmap*>(srcPixmap.tqmask ())),
+                TQT_TQPAINTDEVICE(const_cast<TQBitmap*>(srcPixmap.mask ())),
                 0, 0,
                 destRect.width (), destRect.height (),
                 TQt::CopyROP,
-                true/*ignore tqmask*/);
+                true/*ignore mask*/);
-        destPixmapPtr->setMask (tqmask);
+        destPixmapPtr->setMask (mask);
     }
 #endif
 
-    if (destPixmapPtr->tqmask () && !srcPixmap.tqmask ())
+    if (destPixmapPtr->mask () && !srcPixmap.mask ())
     {
     #if DEBUG_KP_PIXMAP_FX && 0
         kdDebug () << "\t\topaque'ing dest rect" << endl;
@@ -726,9 +726,9 @@ void kpPixmapFX::setPixmapAt (TQPixmap *destPixmapPtr, const TQRect &destRect,
 
 #if DEBUG_KP_PIXMAP_FX && 0
     kdDebug () << "\tdestPixmap->hasMask="
-               << (destPixmapPtr->tqmask () ? 1 : 0)
+               << (destPixmapPtr->mask () ? 1 : 0)
                << endl;
-    if (destPixmapPtr->tqmask ())
+    if (destPixmapPtr->mask ())
     {
         TQImage image = kpPixmapFX::convertToImage (*destPixmapPtr);
         int numTrans = 0;
@@ -772,7 +772,7 @@ void kpPixmapFX::paintPixmapAt (TQPixmap *destPixmapPtr, const TQPoint &destAt,
     if (!destPixmapPtr)
         return;
 
-    // Copy src (masked by src's tqmask) on top of dest.
+    // Copy src (masked by src's mask) on top of dest.
     bitBlt (destPixmapPtr, /* dest */
             destAt.x (), destAt.y (), /* dest pt */
             &srcPixmap, /* src */
@@ -852,8 +852,8 @@ void kpPixmapFX::ensureNoAlphaChannel (TQPixmap *destPixmapPtr)
 // public static
 TQBitmap kpPixmapFX::getNonNullMask (const TQPixmap &pm)
 {
-    if (pm.tqmask ())
+    if (pm.mask ())
-        return *pm.tqmask ();
+        return *pm.mask ();
     else
     {
         TQBitmap maskBitmap (pm.width (), pm.height ());
@@ -934,10 +934,10 @@ void kpPixmapFX::paintMaskTransparentWithBrush (TQPixmap *destPixmapPtr, int des
 // public static
 void kpPixmapFX::ensureOpaqueAt (TQPixmap *destPixmapPtr, const TQRect &destRect)
 {
-    if (!destPixmapPtr || !destPixmapPtr->tqmask ()/*already opaque*/)
+    if (!destPixmapPtr || !destPixmapPtr->mask ()/*already opaque*/)
         return;
 
-    TQBitmap maskBitmap = *destPixmapPtr->tqmask ();
+    TQBitmap maskBitmap = *destPixmapPtr->mask ();
 
     TQPainter p (&maskBitmap);
 
@@ -955,16 +955,16 @@ void kpPixmapFX::ensureOpaqueAt (TQPixmap *destPixmapPtr, const TQRect &destRect
 void kpPixmapFX::ensureOpaqueAt (TQPixmap *destPixmapPtr, const TQPoint &destAt,
                                  const TQPixmap &srcPixmap)
 {
-    if (!destPixmapPtr || !destPixmapPtr->tqmask ()/*already opaque*/)
+    if (!destPixmapPtr || !destPixmapPtr->mask ()/*already opaque*/)
         return;
 
-    TQBitmap destMask = *destPixmapPtr->tqmask ();
+    TQBitmap destMask = *destPixmapPtr->mask ();
 
-    if (srcPixmap.tqmask ())
+    if (srcPixmap.mask ())
     {
         bitBlt (&destMask, /* dest */
                 destAt, /* dest pt */
-                srcPixmap.tqmask (), /* src */
+                srcPixmap.mask (), /* src */
                 TQRect (0, 0, srcPixmap.width (), srcPixmap.height ()), /* src rect */
                 TQt::OrROP/*if either is opaque, it's opaque*/);
     }
@@ -1064,7 +1064,7 @@ void kpPixmapFX::fill (TQPixmap *destPixmapPtr, const kpColor &color)
 
     if (color.isOpaque ())
     {
-        destPixmapPtr->setMask (TQBitmap ());  // no tqmask = opaque
+        destPixmapPtr->setMask (TQBitmap ());  // no mask = opaque
         destPixmapPtr->fill (color.toTQColor ());
     }
     else
@@ -1117,7 +1117,7 @@ void kpPixmapFX::resize (TQPixmap *destPixmapPtr, int w, int h,
             painter.setBrush (backgroundColor.toTQColor ());
         }
 
-        if (backgroundColor.isTransparent () || destPixmapPtr->tqmask ())
+        if (backgroundColor.isTransparent () || destPixmapPtr->mask ())
         {
             maskBitmap = kpPixmapFX::getNonNullMask (*destPixmapPtr);
             maskPainter.begin (&maskBitmap);
@@ -1375,7 +1375,7 @@ static TQPixmap xForm (const TQPixmap &pm, const TQWMatrix &transformMatrix_,
     if (backgroundColor.isOpaque ())
         newPixmap.fill (backgroundColor.toTQColor ());
 
-    if (backgroundColor.isTransparent () || pm.tqmask ())
+    if (backgroundColor.isTransparent () || pm.mask ())
     {
         newBitmapMask.resize (newPixmap.width (), newPixmap.height ());
         newBitmapMask.fill (backgroundColor.maskColor ());

kolourpaint/pixmapfx/kppixmapfx.h

@@ -128,7 +128,7 @@ public:
         //
         //           " contains translucency which is not fully"
         //           " supported. The translucency data will be"
-        //           " approximated with a 1-bit transparency tqmask.")
+        //           " approximated with a 1-bit transparency mask.")
         //
         // <moreColorsThanDisplayMessage>:
         //     i18n ("The (image \"example.jpg\"|image from the clipboard)"
@@ -140,21 +140,21 @@ public:
         //     i18n ("The (image \"example.jpg\"|image from the clipboard)"
         //           " contains translucency which is not fully"
         //           " supported. The translucency data will be"
-        //           " approximated with a 1-bit transparency tqmask.")
+        //           " approximated with a 1-bit transparency mask.")
         //
         // <dontAskAgainPrefix>:
         //
         //     Don'tAskAgain ID for dialog.
         //
-        // <tqparent>:
+        // <parent>:
         //
-        //     Dialog tqparent
+        //     Dialog parent
         //
         WarnAboutLossInfo (const TQString &moreColorsThanDisplayAndHasAlphaChannelMessage,
                 const TQString &moreColorsThanDisplayMessage,
                 const TQString &hasAlphaChannelMessage,
                 const TQString &dontAskAgainPrefix,
-                TQWidget *tqparent)
+                TQWidget *parent)
             :
                 m_moreColorsThanDisplayAndHasAlphaChannelMessage (
                     moreColorsThanDisplayAndHasAlphaChannelMessage),
@@ -164,7 +164,7 @@ public:
                     hasAlphaChannelMessage),
                 m_dontAskAgainPrefix (
                     dontAskAgainPrefix),
-                m_parent (tqparent),
+                m_parent (parent),
                 m_isValid (true)
         {
         }
@@ -227,7 +227,7 @@ public:
 
     // Sets the RGB values of the pixels where <pixmap> is transparent to
     // <transparentColor>.  This has visually no effect on the <pixmap>
-    // unless the tqmask is lost.
+    // unless the mask is lost.
     static TQPixmap pixmapWithDefinedTransparentPixels (const TQPixmap &pixmap,
         const TQColor &transparentColor);
 
@@ -238,19 +238,19 @@ public:
 
 
     //
-    // Returns the pixel and tqmask data found at the <rect> in <pm>.
+    // Returns the pixel and mask data found at the <rect> in <pm>.
     //
     static TQPixmap getPixmapAt (const TQPixmap &pm, const TQRect &rect);
 
     //
-    // Sets the pixel and tqmask data at <destRect> in <*destPixmapPtr>
+    // Sets the pixel and mask data at <destRect> in <*destPixmapPtr>
     // to <srcPixmap>.
     //
     static void setPixmapAt (TQPixmap *destPixmapPtr, const TQRect &destRect,
                              const TQPixmap &srcPixmap);
 
     //
-    // Sets the pixel and tqmask data at the rectangle in <*destPixmapPtr>,
+    // Sets the pixel and mask data at the rectangle in <*destPixmapPtr>,
     // with the top-left <destAt> and dimensions <srcPixmap.rect()>,
     // to <srcPixmap>.
     //
@@ -261,7 +261,7 @@ public:
 
     //
     // Draws <srcPixmap> on top of <*destPixmapPtr> at <destAt>.
-    // The tqmask of <*destPixmapPtr> is adjusted so that all opaque
+    // The mask of <*destPixmapPtr> is adjusted so that all opaque
     // pixels in <srcPixmap> will be opaque in <*destPixmapPtr>.
     //
     static void paintPixmapAt (TQPixmap *destPixmapPtr, const TQPoint &destAt,
@@ -293,7 +293,7 @@ public:
 
     //
     // Removes <*destPixmapPtr>'s Alpha Channel and attempts to convert it
-    // to a tqmask.  KolourPaint - and TQPixmap to a great extent - does not
+    // to a mask.  KolourPaint - and TQPixmap to a great extent - does not
     // support Alpha Channels - only masks.  Call this whenever you get
     // a pixmap from a foreign source; else all KolourPaint code will
     // exhibit "undefined behaviour".
@@ -301,8 +301,8 @@ public:
     static void ensureNoAlphaChannel (TQPixmap *destPixmapPtr);
 
     //
-    // Returns <pm>'s tqmask or a fully opaque tqmask (with <pm>'s dimensions)
+    // Returns <pm>'s mask or a fully opaque mask (with <pm>'s dimensions)
-    // if <pm> does not have a tqmask.
+    // if <pm> does not have a mask.
     //
     static TQBitmap getNonNullMask (const TQPixmap &pm);
 
@@ -312,7 +312,7 @@ public:
     static void ensureTransparentAt (TQPixmap *destPixmapPtr, const TQRect &destRect);
 
     //
-    // Sets the tqmask of <*destPixmapPtr> at the rectangle, with the
+    // Sets the mask of <*destPixmapPtr> at the rectangle, with the
     // top-left <destAt> and dimensions <srcMaskBitmap.rect()>,
     // to transparent where <brushBitmap> is opaque.
     //

kolourpaint/tools/kptoolaction.cpp

@@ -34,11 +34,11 @@
 kpToolAction::kpToolAction (const TQString &text,
                             const TQString &pic, const KShortcut &shortcut,
                             const TQObject *receiver, const char *slot,
-                            TQObject *tqparent, const char *name)
+                            TQObject *parent, const char *name)
     : KToggleAction (text,
                      pic, shortcut,
                      receiver, slot,
-                     tqparent, name)
+                     parent, name)
 {
     updateToolTip ();
 }

kolourpaint/tools/kptoolaction.h

@@ -44,7 +44,7 @@ public:
     kpToolAction (const TQString &text,
         const TQString &pic, const KShortcut &shortcut,
         const TQObject *receiver, const char *slot,
-        TQObject *tqparent, const char *name);
+        TQObject *parent, const char *name);
     virtual ~kpToolAction ();
 
 

kolourpaint/tools/kptoolairspray.cpp

@@ -312,7 +312,7 @@ void kpToolAirSprayCommand::addPoints (const TQPointArray &points)
 #endif
 
     TQPixmap pixmap = document ()->getPixmapAt (docRect);
-    TQBitmap tqmask;
+    TQBitmap mask;
 
     TQPainter painter, maskPainter;
 
@@ -322,10 +322,10 @@ void kpToolAirSprayCommand::addPoints (const TQPointArray &points)
         painter.setPen (m_color.toTQColor ());
     }
 
-    if (pixmap.tqmask () || m_color.isTransparent ())
+    if (pixmap.mask () || m_color.isTransparent ())
     {
-        tqmask = kpPixmapFX::getNonNullMask (pixmap);
+        mask = kpPixmapFX::getNonNullMask (pixmap);
-        maskPainter.begin (&tqmask);
+        maskPainter.begin (&mask);
         maskPainter.setPen (m_color.maskColor ());
     }
 
@@ -347,8 +347,8 @@ void kpToolAirSprayCommand::addPoints (const TQPointArray &points)
     if (painter.isActive ())
         painter.end ();
 
-    if (!tqmask.isNull ())
+    if (!mask.isNull ())
-        pixmap.setMask (tqmask);
+        pixmap.setMask (mask);
 
     viewManager ()->setFastUpdates ();
     document ()->setPixmapAt (pixmap, docRect.topLeft ());

kolourpaint/tools/kptoolautocrop.cpp

@@ -720,11 +720,11 @@ void kpToolAutoCropCommand::unexecute ()
             // and the other branch would execute.
             if (*p)
             {
-                // TODO: We should really edit the tqmask here.  Due to good
+                // TODO: We should really edit the mask here.  Due to good
                 //       luck (if "maskBitmap" is initialized above, this region
-                //       will be marked as opaque in the tqmask; if it's not
+                //       will be marked as opaque in the mask; if it's not
                 //       initialized, we will be opaque by default), we
-                //       don't actually have to edit the tqmask but this is
+                //       don't actually have to edit the mask but this is
                 //       highly error-prone.
                 painter.drawPixmap ((*b)->rect (), **p);
             }

kolourpaint/tools/kptoolcrop.cpp

@@ -132,7 +132,7 @@ void kpToolCropSetImageCommand::execute ()
         //
         // The selection is deleted.
         //
-        // TODO: Do not introduce a tqmask if the result will not contain
+        // TODO: Do not introduce a mask if the result will not contain
         //       any transparent pixels.
         //
 

kolourpaint/tools/kptoolflip.cpp

@@ -149,8 +149,8 @@ void kpToolFlipCommand::flip ()
 bool kpToolFlipDialog::s_lastIsVerticalFlip = true;
 
 
-kpToolFlipDialog::kpToolFlipDialog (bool actOnSelection, TQWidget *tqparent)
+kpToolFlipDialog::kpToolFlipDialog (bool actOnSelection, TQWidget *parent)
-    : KDialogBase (tqparent, 0/*name*/, true/*modal*/,
+    : KDialogBase (parent, 0/*name*/, true/*modal*/,
                    actOnSelection ? i18n ("Flip Selection") : i18n ("Flip Image"),
                    KDialogBase::Ok | KDialogBase::Cancel)
 {

kolourpaint/tools/kptoolflip.h

@@ -68,7 +68,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpToolFlipDialog (bool actOnSelection, TQWidget *tqparent);
+    kpToolFlipDialog (bool actOnSelection, TQWidget *parent);
     ~kpToolFlipDialog ();
 
 private:

kolourpaint/tools/kptoolpen.cpp

@@ -398,7 +398,7 @@ void kpToolPen::globalDraw ()
         }
 
         if (backgroundColor ().isTransparent () ||
-            document ()->pixmap ()->tqmask ())
+            document ()->pixmap ()->mask ())
         {
             maskBitmap = kpPixmapFX::getNonNullMask (*document ()->pixmap ());
             maskPainter.begin (&maskBitmap);
@@ -475,10 +475,10 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
             }
             else
             {
-                TQBitmap tqmask (1, 1);
+                TQBitmap mask (1, 1);
-                tqmask.fill (TQt::color0/*transparent*/);
+                mask.fill (TQt::color0/*transparent*/);
 
-                pixmap.setMask (tqmask);
+                pixmap.setMask (mask);
             }
 
             // draw onto doc
@@ -529,7 +529,7 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
             }
 
             if (color (m_mouseButton).isTransparent () ||
-                pixmap.tqmask ())
+                pixmap.mask ())
             {
                 maskBitmap = kpPixmapFX::getNonNullMask (pixmap);
                 maskPainter.begin (&maskBitmap);
@@ -606,7 +606,7 @@ void kpToolPen::draw (const TQPoint &thisPoint, const TQPoint &lastPoint, const
                 painter.setPen (c.toTQColor ());
             }
 
-            if (transparent || pixmap.tqmask ())
+            if (transparent || pixmap.mask ())
             {
                 maskBitmap = kpPixmapFX::getNonNullMask (pixmap);
                 maskPainter.begin (&maskBitmap);
@@ -966,7 +966,7 @@ void kpToolPen::slotEraserSizeChanged (int size)
     for (int i = 0; i < 2; i++)
     {
         // Note: No matter what, the eraser's brush pixmap is never given
-        //       a tqmask.
+        //       a mask.
         //
         // With a transparent color, since we don't fill anything, the
         // resize by itself will leave us with garbage pixels.  This

kolourpaint/tools/kptoolpolygon.cpp

@@ -164,7 +164,7 @@ static TQPixmap pixmap (const TQPixmap &oldPixmap,
 
     TQPainter painter, maskPainter;
 
-    if (pixmap.tqmask () ||
+    if (pixmap.mask () ||
         (maskPen.style () != TQt::NoPen &&
          maskPen.color () == TQt::color0/*transparent*/) ||
         (maskBrush.style () != TQt::NoBrush &&
@@ -177,7 +177,7 @@ static TQPixmap pixmap (const TQPixmap &oldPixmap,
 
     #if DEBUG_KP_TOOL_POLYGON && 0
         kdDebug () << "\tmaskPainter begin because:" << endl
-                   << "\t\tpixmap.tqmask=" << pixmap.tqmask () << endl
+                   << "\t\tpixmap.mask=" << pixmap.mask () << endl
                    << "\t\t(maskPenStyle!=NoPen)=" << (maskPen.style () != TQt::NoPen) << endl
                    << "\t\t(maskPenColor==trans)=" << (maskPen.color () == TQt::color0) << endl
                    << "\t\t(maskBrushStyle!=NoBrush)=" << (maskBrush.style () != TQt::NoBrush) << endl

kolourpaint/tools/kptoolpreviewdialog.cpp

@@ -51,14 +51,14 @@ kpToolPreviewDialog::kpToolPreviewDialog (Features features,
                                           const TQString &caption,
                                           const TQString &afterActionText,
                                           bool actOnSelection,
-                                          kpMainWindow *tqparent,
+                                          kpMainWindow *parent,
                                           const char *name)
-    : KDialogBase (tqparent, name, true/*modal*/,
+    : KDialogBase (parent, name, true/*modal*/,
                    caption,
                    KDialogBase::Ok | KDialogBase::Cancel),
       m_afterActionText (afterActionText),
       m_actOnSelection (actOnSelection),
-      m_mainWindow (tqparent),
+      m_mainWindow (parent),
       m_dimensionsGroupBox (0),
       m_afterTransformDimensionsLabel (0),
       m_previewGroupBox (0),

kolourpaint/tools/kptoolpreviewdialog.h

@@ -63,7 +63,7 @@ public:
                          // (in the Dimensions Group Box) e.g. "After Skew:"
                          const TQString &afterActionText,
                          bool actOnSelection,
-                         kpMainWindow *tqparent,
+                         kpMainWindow *parent,
                          const char *name = 0);
     virtual ~kpToolPreviewDialog ();
 
@@ -77,7 +77,7 @@ public:
 protected:
     kpDocument *document () const;
 
-    // All widgets must have mainWidget() as their tqparent
+    // All widgets must have mainWidget() as their parent
     void addCustomWidgetToFront (TQWidget *w);  // see <reserveTopRow> in ctor
     void addCustomWidget (TQWidget *w);
     void addCustomWidgetToBack (TQWidget *w)

kolourpaint/tools/kptoolrectangle.cpp

@@ -76,7 +76,7 @@ static TQPixmap pixmap (const kpToolRectangle::Mode mode,
                << endl;
 #endif
 
-    if (pixmap.tqmask () ||
+    if (pixmap.mask () ||
         (maskPen.style () != TQt::NoPen &&
          maskPen.color () ==  TQt::color0/*transparent*/) ||
         (maskBrush.style () != TQt::NoBrush &&

kolourpaint/tools/kptoolrotate.h

@@ -85,7 +85,7 @@ Q_OBJECT
 
 public:
     kpToolRotateDialog (bool actOnSelection,
-                        kpMainWindow *tqparent,
+                        kpMainWindow *parent,
                         const char *name = 0);
     virtual ~kpToolRotateDialog ();
 

kolourpaint/tools/kptoolselection.cpp

@@ -1307,7 +1307,7 @@ void kpToolSelection::selectionTransparencyChanged (const TQString & /*name*/)
         //       Undo.
         //       The rectangle is no longer invisible.
         //
-        //if (document ()->selection ()->setTransparency (st, true/*check harder for no change in tqmask*/))
+        //if (document ()->selection ()->setTransparency (st, true/*check harder for no change in mask*/))
 
         document ()->selection ()->setTransparency (st);
         if (true)

kolourpaint/tools/kptoolskew.cpp

@@ -218,13 +218,13 @@ int kpToolSkewDialog::s_lastHorizontalAngle = 0,
     kpToolSkewDialog::s_lastVerticalAngle = 0;
 
 
-kpToolSkewDialog::kpToolSkewDialog (bool actOnSelection, kpMainWindow *tqparent,
+kpToolSkewDialog::kpToolSkewDialog (bool actOnSelection, kpMainWindow *parent,
                                     const char *name)
     : kpToolPreviewDialog (kpToolPreviewDialog::AllFeatures,
                            false/*don't reserve top row*/,
                            actOnSelection ? i18n ("Skew Selection") : i18n ("Skew Image"),
                            i18n ("After Skew:"),
-                           actOnSelection, tqparent, name)
+                           actOnSelection, parent, name)
 {
     // Too confusing - disable for now
     s_lastHorizontalAngle = s_lastVerticalAngle = 0;

kolourpaint/tools/kptoolskew.h

@@ -79,7 +79,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpToolSkewDialog (bool actOnSelection, kpMainWindow *tqparent,
+    kpToolSkewDialog (bool actOnSelection, kpMainWindow *parent,
                       const char *name = 0);
     virtual ~kpToolSkewDialog ();
 

kolourpaint/views/kpthumbnailview.cpp

@@ -39,12 +39,12 @@ kpThumbnailView::kpThumbnailView (kpDocument *document,
         kpViewManager *viewManager,
         kpView *buddyView,
         kpViewScrollableContainer *scrollableContainer,
-        TQWidget *tqparent, const char *name)
+        TQWidget *parent, const char *name)
 
     : kpView (document, toolToolBar, viewManager,
               buddyView,
               scrollableContainer,
-              tqparent, name)
+              parent, name)
 {
 }
 

kolourpaint/views/kpthumbnailview.h

@@ -54,7 +54,7 @@ public:
                      kpViewManager *viewManager,
                      kpView *buddyView,
                      kpViewScrollableContainer *scrollableContainer,
-                     TQWidget *tqparent, const char *name);
+                     TQWidget *parent, const char *name);
 
     /**
      * Destructs this thumbnail view.
@@ -70,7 +70,7 @@ public:
 
 protected:
     /**
-     * Sets the tqmask to cover the rectangle with top-left, origin() and
+     * Sets the mask to cover the rectangle with top-left, origin() and
      * dimensions equal to or slightly less than (in case of rounding
      * error) the size of the document in view coordinates.  This ensures
      * that all pixels are initialised with either document pixels or the

kolourpaint/views/kpunzoomedthumbnailview.cpp

@@ -50,12 +50,12 @@ kpUnzoomedThumbnailView::kpUnzoomedThumbnailView (
         kpViewManager *viewManager,
         kpView *buddyView,
         kpViewScrollableContainer *scrollableContainer,
-        TQWidget *tqparent, const char *name)
+        TQWidget *parent, const char *name)
 
     : kpThumbnailView (document, toolToolBar, viewManager,
                        buddyView,
                        scrollableContainer,
-                       tqparent, name),
+                       parent, name),
       d (new kpUnzoomedThumbnailViewPrivate ())
 {
     if (buddyViewScrollableContainer ())

kolourpaint/views/kpunzoomedthumbnailview.h

@@ -66,7 +66,7 @@ public:
             kpViewManager *viewManager,
             kpView *buddyView,
             kpViewScrollableContainer *scrollableContainer,
-            TQWidget *tqparent, const char *name);
+            TQWidget *parent, const char *name);
 
     /**
      * Destructs an unzoomed thumbnail view.
@@ -87,7 +87,7 @@ public slots:
      * container will be visible.
      *
      * It tries to maximise the used area of this view.  Unused areas will
-     * be set to the widget background thanks to the tqmask.
+     * be set to the widget background thanks to the mask.
      *
      * Call this if the size of the document changes.
      * Already connected to buddyViewScrollableContainer()'s

kolourpaint/views/kpzoomedthumbnailview.cpp

@@ -43,12 +43,12 @@ kpZoomedThumbnailView::kpZoomedThumbnailView (kpDocument *document,
         kpViewManager *viewManager,
         kpView *buddyView,
         kpViewScrollableContainer *scrollableContainer,
-        TQWidget *tqparent, const char *name)
+        TQWidget *parent, const char *name)
 
     : kpThumbnailView (document, toolToolBar, viewManager,
                        buddyView,
                        scrollableContainer,
-                       tqparent, name)
+                       parent, name)
 {
     // Call to virtual function - this is why the class is sealed
     adjustToEnvironment ();

kolourpaint/views/kpzoomedthumbnailview.h

@@ -61,7 +61,7 @@ public:
             kpViewManager *viewManager,
             kpView *buddyView,
             kpViewScrollableContainer *scrollableContainer,
-            TQWidget *tqparent, const char *name);
+            TQWidget *parent, const char *name);
 
     /**
      * Destructs a zoomed thumbnail view.
@@ -78,7 +78,7 @@ public:
 public slots:
     /**
      * Changes its zoom level to accommodate the display of entire document
-     * in the view.  It maintains aspect by changing the origin and tqmask.
+     * in the view.  It maintains aspect by changing the origin and mask.
      *
      * Call this if the size of the document changes.
      * Already called by @ref kpThumbnailView resizeEvent().

kolourpaint/views/kpzoomedview.cpp

@@ -43,12 +43,12 @@ kpZoomedView::kpZoomedView (kpDocument *document,
         kpViewManager *viewManager,
         kpView *buddyView,
         kpViewScrollableContainer *scrollableContainer,
-        TQWidget *tqparent, const char *name)
+        TQWidget *parent, const char *name)
 
     : kpView (document, toolToolBar, viewManager,
               buddyView,
               scrollableContainer,
-              tqparent, name)
+              parent, name)
 {
     // Call to virtual function - this is why the class is sealed
     adjustToEnvironment ();

kolourpaint/views/kpzoomedview.h

@@ -62,7 +62,7 @@ public:
                   kpViewManager *viewManager,
                   kpView *buddyView,
                   kpViewScrollableContainer *scrollableContainer,
-                  TQWidget *tqparent, const char *name);
+                  TQWidget *parent, const char *name);
 
     /**
      * Destructs an unzoomed view.

kolourpaint/widgets/kpcolorsimilaritycube.cpp

@@ -49,9 +49,9 @@ const double kpColorSimilarityCube::colorCubeDiagonalDistance =
 
 kpColorSimilarityCube::kpColorSimilarityCube (int look,
                                               kpMainWindow *mainWindow,
-                                              TQWidget *tqparent,
+                                              TQWidget *parent,
                                               const char *name)
-    : TQFrame (tqparent, name, TQt::WNoAutoErase/*no flicker*/),
+    : TQFrame (parent, name, TQt::WNoAutoErase/*no flicker*/),
       m_mainWindow (mainWindow),
       m_colorSimilarity (-1)
 {

kolourpaint/widgets/kpcolorsimilaritycube.h

@@ -46,7 +46,7 @@ public:
 
     kpColorSimilarityCube (int look,
                            kpMainWindow *mainWindow,
-                           TQWidget *tqparent,
+                           TQWidget *parent,
                            const char *name = 0);
     virtual ~kpColorSimilarityCube ();
 

kolourpaint/widgets/kpcolorsimilaritydialog.cpp

@@ -44,9 +44,9 @@ const double kpColorSimilarityDialog::maximumColorSimilarity = .30;
 
 
 kpColorSimilarityDialog::kpColorSimilarityDialog (kpMainWindow *mainWindow,
-                                                  TQWidget *tqparent,
+                                                  TQWidget *parent,
                                                   const char *name)
-    : KDialogBase (tqparent, name, true/*modal*/,
+    : KDialogBase (parent, name, true/*modal*/,
                    i18n ("Color Similarity"),
                    KDialogBase::Ok | KDialogBase::Cancel),
       m_mainWindow (mainWindow)

kolourpaint/widgets/kpcolorsimilaritydialog.h

@@ -42,7 +42,7 @@ Q_OBJECT
 
 public:
     kpColorSimilarityDialog (kpMainWindow *mainWindow,
-                             TQWidget *tqparent,
+                             TQWidget *parent,
                              const char *name = 0);
     virtual ~kpColorSimilarityDialog ();
 

kolourpaint/widgets/kpcolortoolbar.cpp

@@ -61,8 +61,8 @@
  */
 
 kpDualColorButton::kpDualColorButton (kpMainWindow *mainWindow,
-                                      TQWidget *tqparent, const char *name)
+                                      TQWidget *parent, const char *name)
-    : TQFrame (tqparent, name, TQt::WNoAutoErase/*no flicker*/),
+    : TQFrame (parent, name, TQt::WNoAutoErase/*no flicker*/),
       m_mainWindow (mainWindow),
       m_backBuffer (0)
 {
@@ -257,7 +257,7 @@ void kpDualColorButton::mouseDoubleClickEvent (TQMouseEvent *e)
             //       to opaque colors.
         }
 
-        // TODO: tqparent
+        // TODO: parent
         if (KColorDialog::getColor (col/*ref*/))
             setColor (whichColor, kpColor (col.rgb ()));
     }
@@ -324,7 +324,7 @@ void kpDualColorButton::drawContents (TQPainter *p)
     TQPixmap swapPixmap = UserIcon ("colorbutton_swap_16x16");
     if (!isEnabled ())
     {
-        // swapPixmap has a tqmask after all
+        // swapPixmap has a mask after all
         swapPixmap.fill (tqcolorGroup ().color (TQColorGroup::Dark));
     }
     backBufferPainter.drawPixmap (swapPixmapRect ().topLeft (), swapPixmap);
@@ -461,10 +461,10 @@ static bool ownColorsInitialised = false;
  */
 #define rows 2
 #define cols 11
-kpColorCells::kpColorCells (TQWidget *tqparent,
+kpColorCells::kpColorCells (TQWidget *parent,
                             Qt::Orientation o,
                             const char *name)
-    : KColorCells (tqparent, rows, cols),
+    : KColorCells (parent, rows, cols),
       m_mouseButton (-1)
 {
     setName (name);
@@ -729,7 +729,7 @@ void kpColorCells::slotColorDoubleClicked (int cell)
 
     TQColor color = KColorCells::color (cell);
 
-    // TODO: tqparent
+    // TODO: parent
     if (KColorDialog::getColor (color/*ref*/))
         KColorCells::setColor (cell, color);
 }
@@ -739,8 +739,8 @@ void kpColorCells::slotColorDoubleClicked (int cell)
  * kpTransparentColorCell
  */
 
-kpTransparentColorCell::kpTransparentColorCell (TQWidget *tqparent, const char *name)
+kpTransparentColorCell::kpTransparentColorCell (TQWidget *parent, const char *name)
-    : TQFrame (tqparent, name)
+    : TQFrame (parent, name)
 {
 #if DEBUG_KP_COLOR_TOOL_BAR
     kdDebug () << "kpTransparentColorCell::kpTransparentColorCell()" << endl;
@@ -818,10 +818,10 @@ void kpTransparentColorCell::drawContents (TQPainter *p)
  * kpColorPalette
  */
 
-kpColorPalette::kpColorPalette (TQWidget *tqparent,
+kpColorPalette::kpColorPalette (TQWidget *parent,
                                 Qt::Orientation o,
                                 const char *name)
-    : TQWidget (tqparent, name),
+    : TQWidget (parent, name),
       m_boxLayout (0)
 {
 #if DEBUG_KP_COLOR_TOOL_BAR
@@ -882,11 +882,11 @@ void kpColorPalette::setOrientation (Qt::Orientation o)
  */
 
 kpColorSimilarityToolBarItem::kpColorSimilarityToolBarItem (kpMainWindow *mainWindow,
-                                                            TQWidget *tqparent,
+                                                            TQWidget *parent,
                                                             const char *name)
     : kpColorSimilarityCube (kpColorSimilarityCube::Depressed |
                              kpColorSimilarityCube::DoubleClickInstructions,
-                             mainWindow, tqparent, name),
+                             mainWindow, parent, name),
       m_mainWindow (mainWindow),
       m_processedColorSimilarity (kpColor::Exact)
 {

kolourpaint/widgets/kpcolortoolbar.h

@@ -63,7 +63,7 @@ Q_OBJECT
 
 public:
     kpDualColorButton (kpMainWindow *mainWindow,
-                       TQWidget *tqparent, const char *name = 0);
+                       TQWidget *parent, const char *name = 0);
     virtual ~kpDualColorButton ();
 
     kpColor color (int which) const;
@@ -122,7 +122,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpColorCells (TQWidget *tqparent,
+    kpColorCells (TQWidget *parent,
                   Qt::Orientation o = Qt::Horizontal,
                   const char *name = 0);
     virtual ~kpColorCells ();
@@ -160,7 +160,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpTransparentColorCell (TQWidget *tqparent, const char *name = 0);
+    kpTransparentColorCell (TQWidget *parent, const char *name = 0);
     virtual ~kpTransparentColorCell ();
 
     virtual TQSize tqsizeHint () const;
@@ -188,7 +188,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpColorPalette (TQWidget *tqparent,
+    kpColorPalette (TQWidget *parent,
                     Qt::Orientation o = Qt::Horizontal,
                     const char *name = 0);
     virtual ~kpColorPalette ();
@@ -216,7 +216,7 @@ Q_OBJECT
 
 public:
     kpColorSimilarityToolBarItem (kpMainWindow *mainWindow,
-                                  TQWidget *tqparent,
+                                  TQWidget *parent,
                                   const char *name = 0);
     virtual ~kpColorSimilarityToolBarItem ();
 

kolourpaint/widgets/kpresizesignallinglabel.cpp

@@ -34,15 +34,15 @@
 
 
 kpResizeSignallingLabel::kpResizeSignallingLabel (const TQString &string,
-                                                  TQWidget *tqparent,
+                                                  TQWidget *parent,
                                                   const char *name)
-    : TQLabel (string, tqparent, name)
+    : TQLabel (string, parent, name)
 {
 }
 
-kpResizeSignallingLabel::kpResizeSignallingLabel (TQWidget *tqparent,
+kpResizeSignallingLabel::kpResizeSignallingLabel (TQWidget *parent,
                                                   const char *name)
-    : TQLabel (tqparent, name)
+    : TQLabel (parent, name)
 {
 }
 

kolourpaint/widgets/kpresizesignallinglabel.h

@@ -38,8 +38,8 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpResizeSignallingLabel (const TQString &string, TQWidget *tqparent, const char *name = 0);
+    kpResizeSignallingLabel (const TQString &string, TQWidget *parent, const char *name = 0);
-    kpResizeSignallingLabel (TQWidget *tqparent, const char *name = 0);
+    kpResizeSignallingLabel (TQWidget *parent, const char *name = 0);
     virtual ~kpResizeSignallingLabel ();
 
 signals:

kolourpaint/widgets/kpsqueezedtextlabel.cpp

@@ -38,14 +38,14 @@
 #include <klocale.h>
 
 
-kpSqueezedTextLabel::kpSqueezedTextLabel (TQWidget *tqparent, const char *name)
+kpSqueezedTextLabel::kpSqueezedTextLabel (TQWidget *parent, const char *name)
-    : TQLabel (tqparent, name),
+    : TQLabel (parent, name),
       m_showEllipsis (true)
 {
 }
 
-kpSqueezedTextLabel::kpSqueezedTextLabel (const TQString &text, TQWidget *tqparent, const char *name)
+kpSqueezedTextLabel::kpSqueezedTextLabel (const TQString &text, TQWidget *parent, const char *name)
-    : TQLabel (tqparent, name),
+    : TQLabel (parent, name),
       m_showEllipsis (true)
 {
     setText (text);

kolourpaint/widgets/kpsqueezedtextlabel.h

@@ -40,8 +40,8 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpSqueezedTextLabel (TQWidget *tqparent, const char *name = 0);
+    kpSqueezedTextLabel (TQWidget *parent, const char *name = 0);
-    kpSqueezedTextLabel (const TQString &text, TQWidget *tqparent, const char *name = 0);
+    kpSqueezedTextLabel (const TQString &text, TQWidget *parent, const char *name = 0);
 
     virtual TQSize tqminimumSizeHint () const;
 

kolourpaint/widgets/kptooltoolbar.cpp

@@ -58,8 +58,8 @@
 class kpToolButton : public TQToolButton
 {
 public:
-    kpToolButton (kpTool *tool, TQWidget *tqparent)
+    kpToolButton (kpTool *tool, TQWidget *parent)
-        : TQToolButton (tqparent),
+        : TQToolButton (parent),
           m_tool (tool)
     {
     }

kolourpaint/widgets/kptoolwidgetbase.cpp

@@ -45,8 +45,8 @@
 #include <kpeffectinvert.h>
 
 
-kpToolWidgetBase::kpToolWidgetBase (TQWidget *tqparent, const char *name)
+kpToolWidgetBase::kpToolWidgetBase (TQWidget *parent, const char *name)
-    : TQFrame (tqparent, name),
+    : TQFrame (parent, name),
       m_invertSelectedPixmap (true),
       m_selectedRow (-1), m_selectedCol (-1)
 {

kolourpaint/widgets/kptoolwidgetbase.h

@@ -40,14 +40,14 @@
 class TQPainter;
 
 
-// TODO: frame becomes a combobox when its tqparent kpToolToolBar becomes too small
+// TODO: frame becomes a combobox when its parent kpToolToolBar becomes too small
 class kpToolWidgetBase : public TQFrame
 {
 Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpToolWidgetBase (TQWidget *tqparent, const char *name);  // must provide a name for config to work
+    kpToolWidgetBase (TQWidget *parent, const char *name);  // must provide a name for config to work
     virtual ~kpToolWidgetBase ();
 
 public:

kolourpaint/widgets/kptoolwidgetbrush.cpp

@@ -52,8 +52,8 @@ static int brushSize [][3] =
 #define BRUSH_SIZE_NUM_COLS (int (sizeof (brushSize [0]) / sizeof (brushSize [0][0])))
 #define BRUSH_SIZE_NUM_ROWS (int (sizeof (brushSize) / sizeof (brushSize [0])))
 
-kpToolWidgetBrush::kpToolWidgetBrush (TQWidget *tqparent, const char *name)
+kpToolWidgetBrush::kpToolWidgetBrush (TQWidget *parent, const char *name)
-    : kpToolWidgetBase (tqparent, name)
+    : kpToolWidgetBase (parent, name)
 {
     setInvertSelectedPixmap ();
 

kolourpaint/widgets/kptoolwidgetbrush.h

@@ -39,7 +39,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpToolWidgetBrush (TQWidget *tqparent, const char *name);
+    kpToolWidgetBrush (TQWidget *parent, const char *name);
     virtual ~kpToolWidgetBrush ();
 
 private:

kolourpaint/widgets/kptoolwidgeterasersize.cpp

@@ -44,8 +44,8 @@ static int eraserSizes [] = {2, 3, 5, 9, 17, 29};
 static const int numEraserSizes = int (sizeof (eraserSizes) / sizeof (eraserSizes [0]));
 
 
-kpToolWidgetEraserSize::kpToolWidgetEraserSize (TQWidget *tqparent, const char *name)
+kpToolWidgetEraserSize::kpToolWidgetEraserSize (TQWidget *parent, const char *name)
-    : kpToolWidgetBase (tqparent, name)
+    : kpToolWidgetBase (parent, name)
 {
     setInvertSelectedPixmap ();
 
@@ -75,14 +75,14 @@ kpToolWidgetEraserSize::kpToolWidgetEraserSize (TQWidget *tqparent, const char *
         painter.fillRect (rect, TQt::black);
         painter.end ();
 
-        TQBitmap tqmask (previewPixmap.width (), previewPixmap.height ());
+        TQBitmap mask (previewPixmap.width (), previewPixmap.height ());
-        tqmask.fill (TQt::color0/*transparent*/);
+        mask.fill (TQt::color0/*transparent*/);
 
-        TQPainter maskPainter (&tqmask);
+        TQPainter maskPainter (&mask);
         maskPainter.fillRect (rect, TQt::color1/*opaque*/);
         maskPainter.end ();
 
-        previewPixmap.setMask (tqmask);
+        previewPixmap.setMask (mask);
 
 
         addOption (previewPixmap, i18n ("%1x%2").arg (s).arg (s)/*tooltip*/);

kolourpaint/widgets/kptoolwidgeterasersize.h

@@ -41,7 +41,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpToolWidgetEraserSize (TQWidget *tqparent, const char *name);
+    kpToolWidgetEraserSize (TQWidget *parent, const char *name);
     virtual ~kpToolWidgetEraserSize ();
 
     int eraserSize () const;

kolourpaint/widgets/kptoolwidgetfillstyle.cpp

@@ -42,8 +42,8 @@
 #include <kptool.h>
 
 
-kpToolWidgetFillStyle::kpToolWidgetFillStyle (TQWidget *tqparent, const char *name)
+kpToolWidgetFillStyle::kpToolWidgetFillStyle (TQWidget *parent, const char *name)
-    : kpToolWidgetBase (tqparent, name)
+    : kpToolWidgetBase (parent, name)
 {
     setInvertSelectedPixmap ();
 
@@ -85,10 +85,10 @@ TQPixmap kpToolWidgetFillStyle::fillStylePixmap (FillStyle fs, int w, int h)
     painter.end ();
 
 
-    TQBitmap tqmask (pixmap.width (), pixmap.height ());
+    TQBitmap mask (pixmap.width (), pixmap.height ());
-    tqmask.fill (TQt::color0);
+    mask.fill (TQt::color0);
 
-    painter.begin (&tqmask);
+    painter.begin (&mask);
     painter.setPen (TQPen (TQt::color1, 2));
 
     if (fs == FillWithBackground || fs == FillWithForeground)
@@ -98,7 +98,7 @@ TQPixmap kpToolWidgetFillStyle::fillStylePixmap (FillStyle fs, int w, int h)
 
     painter.end ();
 
-    pixmap.setMask (tqmask);
+    pixmap.setMask (mask);
 
     return pixmap;
 }

kolourpaint/widgets/kptoolwidgetfillstyle.h

@@ -41,7 +41,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpToolWidgetFillStyle (TQWidget *tqparent, const char *name);
+    kpToolWidgetFillStyle (TQWidget *parent, const char *name);
     virtual ~kpToolWidgetFillStyle ();
 
     enum FillStyle

kolourpaint/widgets/kptoolwidgetlinewidth.cpp

@@ -36,8 +36,8 @@
 
 static int lineWidths [] = {1, 2, 3, 5, 8};
 
-kpToolWidgetLineWidth::kpToolWidgetLineWidth (TQWidget *tqparent, const char *name)
+kpToolWidgetLineWidth::kpToolWidgetLineWidth (TQWidget *parent, const char *name)
-    : kpToolWidgetBase (tqparent, name)
+    : kpToolWidgetBase (parent, name)
 {
     setInvertSelectedPixmap ();
 

kolourpaint/widgets/kptoolwidgetlinewidth.h

@@ -37,7 +37,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpToolWidgetLineWidth (TQWidget *tqparent, const char *name);
+    kpToolWidgetLineWidth (TQWidget *parent, const char *name);
     virtual ~kpToolWidgetLineWidth ();
 
     int lineWidth () const;

kolourpaint/widgets/kptoolwidgetopaqueortransparent.cpp

@@ -35,8 +35,8 @@
 #include <klocale.h>
 
 
-kpToolWidgetOpaqueOrTransparent::kpToolWidgetOpaqueOrTransparent (TQWidget *tqparent, const char *name)
+kpToolWidgetOpaqueOrTransparent::kpToolWidgetOpaqueOrTransparent (TQWidget *parent, const char *name)
-    : kpToolWidgetBase (tqparent, name)
+    : kpToolWidgetBase (parent, name)
 {
     setInvertSelectedPixmap (false);
 

kolourpaint/widgets/kptoolwidgetopaqueortransparent.h

@@ -38,7 +38,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpToolWidgetOpaqueOrTransparent (TQWidget *tqparent, const char *name);
+    kpToolWidgetOpaqueOrTransparent (TQWidget *parent, const char *name);
     virtual ~kpToolWidgetOpaqueOrTransparent ();
 
     bool isOpaque () const;

kolourpaint/widgets/kptoolwidgetspraycansize.cpp

@@ -44,8 +44,8 @@
 
 static int spraycanSizes [] = {9, 17, 29};
 
-kpToolWidgetSpraycanSize::kpToolWidgetSpraycanSize (TQWidget *tqparent, const char *name)
+kpToolWidgetSpraycanSize::kpToolWidgetSpraycanSize (TQWidget *parent, const char *name)
-    : kpToolWidgetBase (tqparent, name)
+    : kpToolWidgetBase (parent, name)
 {
 #if DEBUG_KP_TOOL_WIDGET_SPRAYCAN_SIZE
     kdDebug () << "kpToolWidgetSpraycanSize::kpToolWidgetSpraycanSize() CALLED!" << endl;
@@ -69,10 +69,10 @@ kpToolWidgetSpraycanSize::kpToolWidgetSpraycanSize (TQWidget *tqparent, const ch
 
         TQImage image = kpPixmapFX::convertToImage (pixmap);
 
-        TQBitmap tqmask (pixmap.width (), pixmap.height ());
+        TQBitmap mask (pixmap.width (), pixmap.height ());
-        tqmask.fill (TQt::color0);
+        mask.fill (TQt::color0);
 
-        painter.begin (&tqmask);
+        painter.begin (&mask);
         painter.setPen (TQt::color1);
         
         for (int y = 0; y < image.height (); y++)
@@ -86,7 +86,7 @@ kpToolWidgetSpraycanSize::kpToolWidgetSpraycanSize (TQWidget *tqparent, const ch
 
         painter.end ();
 
-        pixmap.setMask (tqmask);
+        pixmap.setMask (mask);
         
         addOption (pixmap, i18n ("%1x%2").arg (s).arg (s)/*tooltip*/);
         if (i == 1)

kolourpaint/widgets/kptoolwidgetspraycansize.h

@@ -37,7 +37,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-    kpToolWidgetSpraycanSize (TQWidget *tqparent, const char *name);
+    kpToolWidgetSpraycanSize (TQWidget *parent, const char *name);
     virtual ~kpToolWidgetSpraycanSize ();
 
     int spraycanSize () const;

kooka/dwmenuaction.cpp

@@ -32,9 +32,9 @@
 //-------------------------------------
 
 dwMenuAction::dwMenuAction( const TQString& text, const KShortcut& cut,
-			    KDockWidget *dw,TQObject* tqparent,
+			    KDockWidget *dw,TQObject* parent,
 			    KDockMainWindow *mw, const char* name )
-    :KToggleAction(text,cut,tqparent,name),m_dw(dw),m_mw(mw)
+    :KToggleAction(text,cut,parent,name),m_dw(dw),m_mw(mw)
 {
     connect(this,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotToggled(bool)));
     connect(m_dw->dockManager(),TQT_SIGNAL(change()),this,TQT_SLOT(anDWChanged()));

kooka/dwmenuaction.h

@@ -47,7 +47,7 @@ class dwMenuAction:public KToggleAction
 public:
    dwMenuAction( const TQString& text,
 		 const KShortcut& cut = KShortcut(),
-		 KDockWidget *dw=0, TQObject* tqparent = 0,
+		 KDockWidget *dw=0, TQObject* parent = 0,
 		 KDockMainWindow * mw=0, const char* name = 0 );
    virtual ~dwMenuAction();
 

kooka/imageselectline.cpp

@@ -47,8 +47,8 @@
  * together in a row. The button opens a file selector box to pick a file.
  */
 
-ImageSelectLine::ImageSelectLine( TQWidget *tqparent, const TQString& text )
+ImageSelectLine::ImageSelectLine( TQWidget *parent, const TQString& text )
-   : TQHBox( tqparent )
+   : TQHBox( parent )
 {
    setSpacing( 5 );
    (void) new TQLabel( text, this );

kooka/imageselectline.h

@@ -45,7 +45,7 @@ class ImageSelectLine:public TQHBox
    Q_OBJECT
   TQ_OBJECT
 public:
-   ImageSelectLine( TQWidget *tqparent, const TQString& text );
+   ImageSelectLine( TQWidget *parent, const TQString& text );
 
    KURL selectedURL() const;
    void setURL( const KURL& );

kooka/img_saver.cpp

@@ -58,8 +58,8 @@
 #include "previewer.h"
 #include "kookaimage.h"
 
-FormatDialog::FormatDialog( TQWidget *tqparent, const TQString&, const char *name )
+FormatDialog::FormatDialog( TQWidget *parent, const TQString&, const char *name )
-   :KDialogBase( tqparent, name, true,
+   :KDialogBase( parent, name, true,
                  /* Tabbed,*/ i18n( "Kooka Save Assistant" ),
 		 Ok|Cancel, Ok )
 
@@ -218,8 +218,8 @@ void FormatDialog::buildHelp( void )
 
 /* ********************************************************************** */
 
-ImgSaver::ImgSaver(  TQWidget *tqparent, const KURL dir_name )
+ImgSaver::ImgSaver(  TQWidget *parent, const KURL dir_name )
-   : TQObject( tqparent )
+   : TQObject( parent )
 {
 
    if( dir_name.isEmpty() || dir_name.protocol() != "file" )
@@ -250,8 +250,8 @@ ImgSaver::ImgSaver(  TQWidget *tqparent, const KURL dir_name )
 }
 
 
-ImgSaver::ImgSaver( TQWidget *tqparent )
+ImgSaver::ImgSaver( TQWidget *parent )
-   :TQObject( tqparent )
+   :TQObject( parent )
 {
    directory = Previewer::galleryRoot();
    createDir( directory );
@@ -395,7 +395,7 @@ TQString ImgSaver::createFilename( TQString format )
 }
 
 /**
- *   This function gets a filename from the tqparent. The filename must not be relative.
+ *   This function gets a filename from the parent. The filename must not be relative.
  **/
 ImgSaveStat ImgSaver::saveImage( TQImage *image, const KURL& filename, const TQString& imgFormat )
 {

kooka/img_saver.h

@@ -103,7 +103,7 @@ class FormatDialog:public KDialogBase
    Q_OBJECT
   TQ_OBJECT
 public:
-   FormatDialog( TQWidget *tqparent, const TQString&, const char * );
+   FormatDialog( TQWidget *parent, const TQString&, const char * );
 
 
    TQString      getFormat( ) const;
@@ -155,8 +155,8 @@ public:
 	 *  @param dir  Name of the save root directory
 	 *  @param name Name of a subdirectory in the saveroot.
 	 **/
-   ImgSaver( TQWidget *tqparent, const KURL );
+   ImgSaver( TQWidget *parent, const KURL );
-   ImgSaver( TQWidget *tqparent );
+   ImgSaver( TQWidget *parent );
 
    TQString     errorString( ImgSaveStat );
    /**

kooka/imgnamecombo.cpp

@@ -38,8 +38,8 @@
 #include "imgnamecombo.h"
 #include "img_saver.h"
 
-ImageNameCombo::ImageNameCombo( TQWidget *tqparent )
+ImageNameCombo::ImageNameCombo( TQWidget *parent )
-   : KComboBox( tqparent )
+   : KComboBox( parent )
 {
    setInsertionPolicy( TQComboBox::AtTop );
 }

kooka/imgprintdialog.cpp

@@ -47,8 +47,8 @@
 #define ID_CUSTOM 2
 #define ID_FIT_PAGE 3
 
-ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *tqparent, const char* name )
+ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* name )
-    : KPrintDialogPage( tqparent, name ),
+    : KPrintDialogPage( parent, name ),
       m_image(img),
       m_ignoreSignal(false)
 {

kooka/imgprintdialog.h

@@ -55,7 +55,7 @@ class ImgPrintDialog: public KPrintDialogPage
     Q_OBJECT
   TQ_OBJECT
 public:
-    ImgPrintDialog( KookaImage *img, TQWidget *tqparent=0L, const char* name=0L );
+    ImgPrintDialog( KookaImage *img, TQWidget *parent=0L, const char* name=0L );
 
     void setOptions(const TQMap<TQString,TQString>& opts);
     void getOptions(TQMap<TQString,TQString>& opts, bool include_def = false);

kooka/kocrbase.cpp

@@ -59,10 +59,10 @@
 #include <tqgroupbox.h>
 #include <tqcheckbox.h>
 
-KOCRBase::KOCRBase( TQWidget *tqparent, KSpellConfig *spellConfig,
+KOCRBase::KOCRBase( TQWidget *parent, KSpellConfig *spellConfig,
                     KDialogBase::DialogType face )
    :KDialogBase( face, i18n("Optical Character Recognition"),
-		 User2|Close|User1, User1, tqparent,0, false, true,
+		 User2|Close|User1, User1, parent,0, false, true,
 		 KGuiItem( i18n("Start OCR" ), "launch",
 			   i18n("Start the Optical Character Recognition process" )),
                  KGuiItem( i18n("Cancel" ), "stopocr",
@@ -98,11 +98,11 @@ KOCRBase::KOCRBase( TQWidget *tqparent, KSpellConfig *spellConfig,
 }
 
 
-KAnimWidget* KOCRBase::getAnimation(TQWidget *tqparent)
+KAnimWidget* KOCRBase::getAnimation(TQWidget *parent)
 {
    if( ! m_animation )
    {
-      m_animation = new KAnimWidget( TQString("kde"), 48, tqparent, "ANIMATION" );
+      m_animation = new KAnimWidget( TQString("kde"), 48, parent, "ANIMATION" );
    }
    return( m_animation );
 }

kooka/kocrgocr.cpp

@@ -58,8 +58,8 @@
 
 
 
-KGOCRDialog::KGOCRDialog( TQWidget *tqparent, KSpellConfig *spellConfig )
+KGOCRDialog::KGOCRDialog( TQWidget *parent, KSpellConfig *spellConfig )
-    :KOCRBase( tqparent, spellConfig, KDialogBase::Tabbed ),
+    :KOCRBase( parent, spellConfig, KDialogBase::Tabbed ),
      m_ocrCmd( TQString())
 {
    kdDebug(28000) << "Starting KOCR-Start-Dialog!" << endl;

kooka/kocrkadmos.cpp

@@ -64,8 +64,8 @@
 #define CNTRY_CZ i18n( "Czech Republic, Slovakia")
 #define CNTRY_GB i18n( "Great Britain, USA" )
 
-KadmosDialog::KadmosDialog( TQWidget *tqparent, KSpellConfig *spellConfig )
+KadmosDialog::KadmosDialog( TQWidget *parent, KSpellConfig *spellConfig )
-    :KOCRBase( tqparent, spellConfig, KDialogBase::Tabbed ),
+    :KOCRBase( parent, spellConfig, KDialogBase::Tabbed ),
      m_cbNoise(0),
      m_cbAutoscale(0),
      m_haveNorm(false)

kooka/kocrocrad.cpp

@@ -54,8 +54,8 @@
 
 
 
-ocradDialog::ocradDialog( TQWidget *tqparent, KSpellConfig *spellConfig )
+ocradDialog::ocradDialog( TQWidget *parent, KSpellConfig *spellConfig )
-    :KOCRBase( tqparent, spellConfig, KDialogBase::Tabbed ),
+    :KOCRBase( parent, spellConfig, KDialogBase::Tabbed ),
      m_ocrCmd( TQString()),
      m_orfUrlRequester(0L),
      m_layoutMode(0),

kooka/kookaimage.cpp

@@ -205,15 +205,15 @@ void KookaImage::extractNow()
 {
    kdDebug(28000) << "extracting a subimage number " << m_subNo << endl;
 
-   KookaImage *tqparent = parentImage();
+   KookaImage *parent = parentImage();
 
-   if( tqparent )
+   if( parent )
    {
-      loadTiffDir( tqparent->localFileName(), m_subNo );
+      loadTiffDir( parent->localFileName(), m_subNo );
    }
    else
    {
-      kdDebug(28000) << "ERR: No tqparent defined - can not laod subimage" << endl;
+      kdDebug(28000) << "ERR: No parent defined - can not laod subimage" << endl;
    }
 }
 

kooka/kookaimage.h

@@ -53,9 +53,9 @@ public:
 
     KookaImage( );
     /**
-     * creating a subimage for a tqparent image.
+     * creating a subimage for a parent image.
      * @param subNo contains the sequence number of subimages to create.
-     * @param p is the tqparent image.
+     * @param p is the parent image.
      */
     KookaImage(  int subNo, KookaImage *p );
     KookaImage( 	const TQImage& img );
@@ -76,7 +76,7 @@ public:
     int         	subImagesCount() const;
 
     /**
-     * the tqparent image.
+     * the parent image.
      */
     KookaImage*  parentImage() const;
 
@@ -144,7 +144,7 @@ private:
     bool                loadTiffDir( const TQString&, int );
 
     /* if subNo is 0, the image is the one and only. If it is larger than 0, the
-     * tqparent contains the filename */
+     * parent contains the filename */
     int                 m_subNo;
 
     /* In case being a subimage */

kooka/kookapref.cpp

@@ -176,12 +176,12 @@ void KookaPreferences::setupOCRPage()
     }
 }
 
-KURLRequester* KookaPreferences::binaryCheckBox( TQWidget *tqparent, const TQString& program )
+KURLRequester* KookaPreferences::binaryCheckBox( TQWidget *parent, const TQString& program )
 {
-    TQHBox *hbox = new TQHBox( tqparent );
+    TQHBox *hbox = new TQHBox( parent );
 
     (void) new TQLabel( i18n("Select the %1 binary to use:").tqarg( program ), hbox );
-    KURLRequester* urlRequester = new KURLRequester( tqparent );
+    KURLRequester* urlRequester = new KURLRequester( parent );
     urlRequester->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly );
 
     TQToolTip::add( urlRequester,

kooka/kookarc

@@ -2,17 +2,17 @@
 Kookas MainDock,Preview ,Thumbs:first_name=Kookas MainDock,Preview\s
 Kookas MainDock,Preview ,Thumbs:last_name=Thumbs
 Kookas MainDock,Preview ,Thumbs:orientation=0
-Kookas MainDock,Preview ,Thumbs:tqparent=yes
+Kookas MainDock,Preview ,Thumbs:parent=yes
 Kookas MainDock,Preview ,Thumbs:sepPos=72
 Kookas MainDock,Preview ,Thumbs:stayButton=false
 Kookas MainDock,Preview ,Thumbs:type=GROUP
 Kookas MainDock,Preview :curTab=0
-Kookas MainDock,Preview :tqparent=yes
+Kookas MainDock,Preview :parent=yes
 Kookas MainDock,Preview :stayButton=false
 Kookas MainDock,Preview :tabNames=Kookas MainDock,Preview\s
 Kookas MainDock,Preview :type=TAB_GROUP
 Kookas MainDock,Thumbs,Preview :curTab=1
-Kookas MainDock,Thumbs,Preview :tqparent=yes
+Kookas MainDock,Thumbs,Preview :parent=yes
 Kookas MainDock,Thumbs,Preview :stayButton=false
 Kookas MainDock,Thumbs,Preview :tabNames=Kookas MainDock,Thumbs,Preview\s
 Kookas MainDock,Thumbs,Preview :type=TAB_GROUP
@@ -20,7 +20,7 @@ Kookas MainDock,Thumbs:curTab=1
 Kookas MainDock,Thumbs:first_name=Kookas MainDock
 Kookas MainDock,Thumbs:last_name=Thumbs
 Kookas MainDock,Thumbs:orientation=0
-Kookas MainDock,Thumbs:tqparent=yes
+Kookas MainDock,Thumbs:parent=yes
 Kookas MainDock,Thumbs:sepPos=54
 Kookas MainDock,Thumbs:stayButton=false
 Kookas MainDock,Thumbs:tabNames=Kookas MainDock,Thumbs
@@ -35,28 +35,28 @@ NameList=Kookas MainDock,Thumbs,Scanpackager,Recent,Scan Parameter,Preview ,Kook
 Preview ,Scanpackager,Recent,Scan Parameter,Kookas MainDock,Thumbs:first_name=Preview ,Scanpackager,Recent,Scan Parameter
 Preview ,Scanpackager,Recent,Scan Parameter,Kookas MainDock,Thumbs:last_name=Kookas MainDock,Thumbs
 Preview ,Scanpackager,Recent,Scan Parameter,Kookas MainDock,Thumbs:orientation=1
-Preview ,Scanpackager,Recent,Scan Parameter,Kookas MainDock,Thumbs:tqparent=yes
+Preview ,Scanpackager,Recent,Scan Parameter,Kookas MainDock,Thumbs:parent=yes
 Preview ,Scanpackager,Recent,Scan Parameter,Kookas MainDock,Thumbs:sepPos=38
 Preview ,Scanpackager,Recent,Scan Parameter,Kookas MainDock,Thumbs:stayButton=false
 Preview ,Scanpackager,Recent,Scan Parameter,Kookas MainDock,Thumbs:type=GROUP
 Preview ,Scanpackager,Recent,Scan Parameter:first_name=Preview ,Scanpackager,Recent
 Preview ,Scanpackager,Recent,Scan Parameter:last_name=Scan Parameter
 Preview ,Scanpackager,Recent,Scan Parameter:orientation=0
-Preview ,Scanpackager,Recent,Scan Parameter:tqparent=yes
+Preview ,Scanpackager,Recent,Scan Parameter:parent=yes
 Preview ,Scanpackager,Recent,Scan Parameter:sepPos=50
 Preview ,Scanpackager,Recent,Scan Parameter:stayButton=false
 Preview ,Scanpackager,Recent,Scan Parameter:type=GROUP
 Preview ,Scanpackager,Recent:first_name=Preview ,Scanpackager
 Preview ,Scanpackager,Recent:last_name=Recent
 Preview ,Scanpackager,Recent:orientation=0
-Preview ,Scanpackager,Recent:tqparent=yes
+Preview ,Scanpackager,Recent:parent=yes
 Preview ,Scanpackager,Recent:sepPos=84
 Preview ,Scanpackager,Recent:stayButton=false
 Preview ,Scanpackager,Recent:type=GROUP
 Preview ,Scanpackager:first_name=Preview\s
 Preview ,Scanpackager:last_name=Scanpackager
 Preview ,Scanpackager:orientation=0
-Preview ,Scanpackager:tqparent=yes
+Preview ,Scanpackager:parent=yes
 Preview ,Scanpackager:sepPos=50
 Preview ,Scanpackager:stayButton=false
 Preview ,Scanpackager:type=GROUP
@@ -65,7 +65,7 @@ Preview :type=DOCK
 Recent,Scan Parameter:first_name=Recent
 Recent,Scan Parameter:last_name=Scan Parameter
 Recent,Scan Parameter:orientation=0
-Recent,Scan Parameter:tqparent=yes
+Recent,Scan Parameter:parent=yes
 Recent,Scan Parameter:sepPos=14
 Recent,Scan Parameter:stayButton=false
 Recent,Scan Parameter:type=GROUP
@@ -76,40 +76,40 @@ Scan Parameter:type=DOCK
 Scanpackager,Preview ,Recent,Scan Parameter,Kookas MainDock,Thumbs:first_name=Scanpackager,Preview ,Recent,Scan Parameter
 Scanpackager,Preview ,Recent,Scan Parameter,Kookas MainDock,Thumbs:last_name=Kookas MainDock,Thumbs
 Scanpackager,Preview ,Recent,Scan Parameter,Kookas MainDock,Thumbs:orientation=1
-Scanpackager,Preview ,Recent,Scan Parameter,Kookas MainDock,Thumbs:tqparent=yes
+Scanpackager,Preview ,Recent,Scan Parameter,Kookas MainDock,Thumbs:parent=yes
 Scanpackager,Preview ,Recent,Scan Parameter,Kookas MainDock,Thumbs:sepPos=38
 Scanpackager,Preview ,Recent,Scan Parameter,Kookas MainDock,Thumbs:stayButton=false
 Scanpackager,Preview ,Recent,Scan Parameter,Kookas MainDock,Thumbs:type=GROUP
 Scanpackager,Preview ,Recent,Scan Parameter:first_name=Scanpackager,Preview\s
 Scanpackager,Preview ,Recent,Scan Parameter:last_name=Recent,Scan Parameter
 Scanpackager,Preview ,Recent,Scan Parameter:orientation=0
-Scanpackager,Preview ,Recent,Scan Parameter:tqparent=yes
+Scanpackager,Preview ,Recent,Scan Parameter:parent=yes
 Scanpackager,Preview ,Recent,Scan Parameter:sepPos=48
 Scanpackager,Preview ,Recent,Scan Parameter:stayButton=false
 Scanpackager,Preview ,Recent,Scan Parameter:type=GROUP
 Scanpackager,Preview :curTab=0
-Scanpackager,Preview :tqparent=yes
+Scanpackager,Preview :parent=yes
 Scanpackager,Preview :stayButton=false
 Scanpackager,Preview :tabNames=Scanpackager,Preview\s
 Scanpackager,Preview :type=TAB_GROUP
 Scanpackager,Recent,Scan Parameter,Kookas MainDock,Preview ,Thumbs:first_name=Scanpackager,Recent,Scan Parameter
 Scanpackager,Recent,Scan Parameter,Kookas MainDock,Preview ,Thumbs:last_name=Kookas MainDock,Preview ,Thumbs
 Scanpackager,Recent,Scan Parameter,Kookas MainDock,Preview ,Thumbs:orientation=1
-Scanpackager,Recent,Scan Parameter,Kookas MainDock,Preview ,Thumbs:tqparent=yes
+Scanpackager,Recent,Scan Parameter,Kookas MainDock,Preview ,Thumbs:parent=yes
 Scanpackager,Recent,Scan Parameter,Kookas MainDock,Preview ,Thumbs:sepPos=41
 Scanpackager,Recent,Scan Parameter,Kookas MainDock,Preview ,Thumbs:stayButton=false
 Scanpackager,Recent,Scan Parameter,Kookas MainDock,Preview ,Thumbs:type=GROUP
 Scanpackager,Recent,Scan Parameter,Kookas MainDock,Thumbs,Preview :first_name=Scanpackager,Recent,Scan Parameter
 Scanpackager,Recent,Scan Parameter,Kookas MainDock,Thumbs,Preview :last_name=Kookas MainDock,Thumbs,Preview\s
 Scanpackager,Recent,Scan Parameter,Kookas MainDock,Thumbs,Preview :orientation=1
-Scanpackager,Recent,Scan Parameter,Kookas MainDock,Thumbs,Preview :tqparent=yes
+Scanpackager,Recent,Scan Parameter,Kookas MainDock,Thumbs,Preview :parent=yes
 Scanpackager,Recent,Scan Parameter,Kookas MainDock,Thumbs,Preview :sepPos=38
 Scanpackager,Recent,Scan Parameter,Kookas MainDock,Thumbs,Preview :stayButton=false
 Scanpackager,Recent,Scan Parameter,Kookas MainDock,Thumbs,Preview :type=GROUP
 Scanpackager,Recent,Scan Parameter:first_name=Scanpackager
 Scanpackager,Recent,Scan Parameter:last_name=Recent,Scan Parameter
 Scanpackager,Recent,Scan Parameter:orientation=0
-Scanpackager,Recent,Scan Parameter:tqparent=yes
+Scanpackager,Recent,Scan Parameter:parent=yes
 Scanpackager,Recent,Scan Parameter:sepPos=42
 Scanpackager,Recent,Scan Parameter:stayButton=false
 Scanpackager,Recent,Scan Parameter:type=GROUP

kooka/kookaview.cpp

@@ -82,7 +82,7 @@
 #define STARTUP_IMG_SELECTION   "SelectedImageOnStartup"
 
 
-KookaView::KookaView( KParts::DockMainWindow *tqparent, const TQCString& deviceToUse)
+KookaView::KookaView( KParts::DockMainWindow *parent, const TQCString& deviceToUse)
    : TQObject(),
      m_ocrResultImg(0),
      ocrFabric(0),
@@ -93,21 +93,21 @@ KookaView::KookaView( KParts::DockMainWindow *tqparent, const TQCString& deviceT
      m_dockRecent(0),
      m_dockPreview(0),
      m_dockOCRText(0),
-     m_mainWindow(tqparent),
+     m_mainWindow(parent),
      m_ocrResEdit(0)
 {
    KIconLoader *loader = KGlobal::iconLoader();
    scan_params = 0L;
    preview_canvas = 0L;
 
-   m_mainDock = tqparent->createDockWidget( "Kookas MainDock",
+   m_mainDock = parent->createDockWidget( "Kookas MainDock",
                                           loader->loadIcon( "folder_image", KIcon::Small ),
                                           0L, i18n("Image Viewer"));
    m_mainDock->setEnableDocking(KDockWidget::DockNone );
    m_mainDock->setDockSite( KDockWidget::DockFullSite );
 
-   tqparent->setView( m_mainDock);
+   parent->setView( m_mainDock);
-   tqparent->setMainDockWidget( m_mainDock);
+   parent->setMainDockWidget( m_mainDock);
 
    img_canvas  = new ImageCanvas( m_mainDock );
    img_canvas->setMinimumSize(100,200);
@@ -121,7 +121,7 @@ KookaView::KookaView( KParts::DockMainWindow *tqparent, const TQCString& deviceT
    m_mainDock->setWidget( img_canvas );
 
    /** Thumbview **/
-   m_dockThumbs = tqparent->createDockWidget( "Thumbs",
+   m_dockThumbs = parent->createDockWidget( "Thumbs",
 					    loader->loadIcon( "thumbnail", KIcon::Small ),
 					    0L,  i18n("Thumbnails"));
    m_dockThumbs->setDockSite(KDockWidget::DockFullSite );
@@ -136,7 +136,7 @@ KookaView::KookaView( KParts::DockMainWindow *tqparent, const TQCString& deviceT
 
    /** Packager Dock **/
    /* A new packager to contain the already scanned images */
-   m_dockPackager = tqparent->createDockWidget( "Scanpackager",
+   m_dockPackager = parent->createDockWidget( "Scanpackager",
 					    loader->loadIcon( "palette_color", KIcon::Small ),
 					    0L, i18n("Gallery"));
    m_dockPackager->setDockSite(KDockWidget::DockFullSite);
@@ -155,7 +155,7 @@ KookaView::KookaView( KParts::DockMainWindow *tqparent, const TQCString& deviceT
    /*
     * Create a Kombobox that holds the last folders visible even on the preview page
     */
-   m_dockRecent  = tqparent->createDockWidget( "Recent",
+   m_dockRecent  = parent->createDockWidget( "Recent",
 					     loader->loadIcon( "image", KIcon::Small ),
 					     0L, i18n("Gallery Folders"));
 
@@ -184,7 +184,7 @@ KookaView::KookaView( KParts::DockMainWindow *tqparent, const TQCString& deviceT
 	    packager, TQT_SLOT(slotSelectDirectory( const TQString& )));
 
    /* the object from the kscan lib to handle low level scanning */
-   m_dockScanParam = tqparent->createDockWidget( "Scan Parameter",
+   m_dockScanParam = parent->createDockWidget( "Scan Parameter",
  					     loader->loadIcon( "folder", KIcon::Small ),
  					     0L, i18n("Scan Parameter"));
    //
@@ -203,7 +203,7 @@ KookaView::KookaView( KParts::DockMainWindow *tqparent, const TQCString& deviceT
     * the complete scanner options dialog
     * scan_params must be zero for that */
 
-   m_dockPreview = tqparent->createDockWidget( "Preview ",
+   m_dockPreview = parent->createDockWidget( "Preview ",
 					   loader->loadIcon( "viewmag", KIcon::Small ),
 					   0L, i18n("Scan Preview"));
 
@@ -222,7 +222,7 @@ KookaView::KookaView( KParts::DockMainWindow *tqparent, const TQCString& deviceT
 
    /* Create a text editor part for ocr results */
 
-   m_dockOCRText = tqparent->createDockWidget( "OCRResults",
+   m_dockOCRText = parent->createDockWidget( "OCRResults",
                                              loader->loadIcon("edit", KIcon::Small ),
                                              0L, i18n("OCR Result Text"));
    // m_textEdit
@@ -876,7 +876,7 @@ void KookaView::slShowThumbnails(KFileTreeViewItem *dirKfi, bool forceRedraw )
       }
       else
       {
-	 kftvi = static_cast<KFileTreeViewItem*>(static_cast<TQListViewItem*>(kftvi)->tqparent());
+	 kftvi = static_cast<KFileTreeViewItem*>(static_cast<TQListViewItem*>(kftvi)->parent());
 	 dirKfi = kftvi;
 	 forceRedraw = true;
 	 packager->setSelected( static_cast<TQListViewItem*>(dirKfi), true );

kooka/kookaview.h

@@ -77,7 +77,7 @@ public:
     /**
      * Default constructor
      */
-    KookaView(KParts::DockMainWindow *tqparent, const TQCString& deviceToUse);
+    KookaView(KParts::DockMainWindow *parent, const TQCString& deviceToUse);
 
     /**
      * Destructor

kooka/ksaneocr.cpp

@@ -183,26 +183,26 @@ void KSANEOCR::slLineBox( const TQRect& )
  * starts visual ocr process. Depending on the ocr engine, this function creates
  * a new dialog, and shows it.
  */
-bool KSANEOCR::startOCRVisible( TQWidget *tqparent )
+bool KSANEOCR::startOCRVisible( TQWidget *parent )
 {
    if( visibleOCRRunning ) return( false );
    bool res = true;
 
-   m_parent = tqparent;
+   m_parent = parent;
 
    if( m_ocrEngine == GOCR )
    {
-       m_ocrProcessDia = new KGOCRDialog ( tqparent, m_spellInitialConfig );
+       m_ocrProcessDia = new KGOCRDialog ( parent, m_spellInitialConfig );
    }
    else if( m_ocrEngine == OCRAD )
    {
-       m_ocrProcessDia = new ocradDialog( tqparent, m_spellInitialConfig );
+       m_ocrProcessDia = new ocradDialog( parent, m_spellInitialConfig );
    }
    else if( m_ocrEngine == KADMOS )
    {
 #ifdef HAVE_KADMOS
 /*** Kadmos Engine OCR ***/
-       m_ocrProcessDia = new KadmosDialog( tqparent, m_spellInitialConfig );
+       m_ocrProcessDia = new KadmosDialog( parent, m_spellInitialConfig );
 #else
        KMessageBox::sorry(0, i18n("This version of Kooka was not compiled with KADMOS support.\n"
            "Please select another OCR engine in Kooka's options dialog."));

kooka/ksaneocr.h

@@ -82,7 +82,7 @@ public:
     KSANEOCR( TQWidget*, KConfig *);
     ~KSANEOCR();
 
-    bool startOCRVisible( TQWidget* tqparent=0);
+    bool startOCRVisible( TQWidget* parent=0);
 
     void finishedOCRVisible( bool );
 

kooka/ocrresedit.cpp

@@ -36,8 +36,8 @@
 
 /* -------------------- ocrResEdit -------------------- */
 
-ocrResEdit::ocrResEdit( TQWidget *tqparent )
+ocrResEdit::ocrResEdit( TQWidget *parent )
-    : TQTextEdit(tqparent)
+    : TQTextEdit(parent)
 {
     m_updateColor.setNamedColor( "SeaGreen");
     m_ignoreColor.setNamedColor( "CadetBlue4" );

kooka/ocrresedit.h

@@ -38,7 +38,7 @@ class ocrResEdit : public TQTextEdit
     Q_OBJECT
   TQ_OBJECT
 public:
-    ocrResEdit( TQWidget  *tqparent );
+    ocrResEdit( TQWidget  *parent );
 
 public slots:
     void slUpdateOCRResult( int line, const TQString& wordFrom,

kooka/scanpackager.cpp

@@ -71,7 +71,7 @@
 
 /* ----------------------------------------------------------------------- */
 /* Constructor Scan Packager */
-ScanPackager::ScanPackager( TQWidget *tqparent ) : KFileTreeView( tqparent )
+ScanPackager::ScanPackager( TQWidget *parent ) : KFileTreeView( parent )
 {
    // TODO:
    setItemsRenameable (true );
@@ -531,7 +531,7 @@ void ScanPackager::slClicked( TQListViewItem *newItem )
 	 }
 	 else
 	 {
-	    emit( showThumbnails(  static_cast<KFileTreeViewItem*>(item->tqparent())));
+	    emit( showThumbnails(  static_cast<KFileTreeViewItem*>(item->parent())));
 	 }
       }
       else
@@ -854,7 +854,7 @@ void ScanPackager::slAddImage( TQImage *img, KookaImageMeta* )
 
    TQString s;
    /* Count amount of tqchildren of the father */
-   TQListViewItem *paps = curr->tqparent();
+   TQListViewItem *paps = curr->parent();
    if( curr->isDir() ) /* take only father if the is no directory */
       paps = curr;
 
@@ -1012,7 +1012,7 @@ void ScanPackager::slotImportFile()
 
     if( ! curr->isDir() )
     {
-        KFileTreeViewItem *pa = static_cast<KFileTreeViewItem*>(curr->tqparent());
+        KFileTreeViewItem *pa = static_cast<KFileTreeViewItem*>(curr->parent());
         impTarget = pa->url();
     }
     kdDebug(28000) << "Importing to " << impTarget.url() << endl;
@@ -1239,12 +1239,12 @@ void ScanPackager::contentsDragMoveEvent( TQDragMoveEvent *e )
    }
 
    TQListViewItem *afterme = 0;
-   TQListViewItem *tqparent = 0;
+   TQListViewItem *parent = 0;
 
-   findDrop( e->pos(), tqparent, afterme );
+   findDrop( e->pos(), parent, afterme );
 
    // "afterme" is 0 when aiming at a directory itself
-   TQListViewItem *item = afterme ? afterme : tqparent;
+   TQListViewItem *item = afterme ? afterme : parent;
 
    if( item )
    {

kooka/scanpackager.h

@@ -76,7 +76,7 @@ class ScanPackager : public KFileTreeView
     Q_OBJECT
   TQ_OBJECT
 public:
-    ScanPackager( TQWidget *tqparent);
+    ScanPackager( TQWidget *parent);
     ~ScanPackager();
     virtual TQString getImgName( TQString name_on_disk );
 
@@ -143,7 +143,7 @@ private:
    KFileTreeViewItem *spFindItem( SearchType type, const TQString name, const KFileTreeBranch* branch = 0 );
    TQString       itemDirectory( const KFileTreeViewItem*, bool relativ = false ) const;
 
-   // int 	        readDir( TQListViewItem *tqparent, TQString dir_to_read );
+   // int 	        readDir( TQListViewItem *parent, TQString dir_to_read );
     void         showContextMenu( TQPoint p, bool show_folder = true );
 
     TQString      m_currImportDir;

kooka/thumbview.cpp

@@ -47,8 +47,8 @@
 
 
 
-ThumbView::ThumbView( TQWidget *tqparent, const char *name )
+ThumbView::ThumbView( TQWidget *parent, const char *name )
-   : TQVBox( tqparent ),
+   : TQVBox( parent ),
      m_iconView(0),
      m_job(0)
 {
@@ -238,7 +238,7 @@ void  ThumbView::slCheckForUpdate( KFileItem *kfit )
    bool haveItem = false;
 
    /* iterate over all icon items and compare urls.
-    * TODO: Check the tqparent url to avoid iteration over all */
+    * TODO: Check the parent url to avoid iteration over all */
    for ( TQIconViewItem *item = m_iconView->firstItem(); item && !haveItem;
 	 item = item->nextItem() )
    {
@@ -269,7 +269,7 @@ bool ThumbView::deleteImage( KFileItem *kfit )
    bool haveItem = false;
 
    /* iterate over all icon items and compare urls.
-    * TODO: Check the tqparent url to avoid iteration over all */
+    * TODO: Check the parent url to avoid iteration over all */
    for ( TQIconViewItem *item = m_iconView->firstItem(); item && !haveItem; item = item->nextItem() )
    {
       if( searchUrl == static_cast<ThumbViewItem*>(item)->itemUrl() )

kooka/thumbview.h

@@ -63,7 +63,7 @@ class ThumbView: public TQVBox /* KIconView */
 
 public:
 
-   ThumbView( TQWidget *tqparent, const char *name=0 );
+   ThumbView( TQWidget *parent, const char *name=0 );
    ~ThumbView();
 
    void setCurrentDir( const KURL& s)

kooka/thumbviewitem.cpp

@@ -32,10 +32,10 @@
 #include "thumbview.h"
 #include "thumbviewitem.h"
 
-ThumbViewItem::ThumbViewItem(TQIconView *tqparent, const TQString &text,
+ThumbViewItem::ThumbViewItem(TQIconView *parent, const TQString &text,
 			     const TQPixmap &pixmap,
 			     KFileItem *fi )
-   :KFileIconViewItem( tqparent, text, pixmap,fi )
+   :KFileIconViewItem( parent, text, pixmap,fi )
 {
 
 }

kooka/thumbviewitem.h

@@ -41,7 +41,7 @@ class KFileTreeViewItem;
 class ThumbViewItem: public KFileIconViewItem
 {
 public:
-   ThumbViewItem( TQIconView *tqparent,
+   ThumbViewItem( TQIconView *parent,
 		  const TQString &text,
 		  const TQPixmap &pixmap,
 		  KFileItem *fi );

kpdf/conf/preferencesdialog.cpp

@@ -18,8 +18,8 @@
 // reimplementing this
 #include "preferencesdialog.h"
 
-PreferencesDialog::PreferencesDialog( TQWidget * tqparent, KConfigSkeleton * skeleton )
+PreferencesDialog::PreferencesDialog( TQWidget * parent, KConfigSkeleton * skeleton )
-    : KConfigDialog( tqparent, "preferences", skeleton )
+    : KConfigDialog( parent, "preferences", skeleton )
 {
     m_general = new DlgGeneral(0);
     m_performance = new DlgPerformance(0);

kpdf/conf/preferencesdialog.h

@@ -25,7 +25,7 @@ class PreferencesDialog : public KConfigDialog
 {
 
     public:
-        PreferencesDialog( TQWidget * tqparent, KConfigSkeleton * config );
+        PreferencesDialog( TQWidget * parent, KConfigSkeleton * config );
 
     protected:
 //      void updateSettings(); // Called when OK/Apply is pressed.

kpdf/core/document.cpp

@@ -357,7 +357,7 @@ void KPDFDocument::reparseConfig()
 
 TQWidget *KPDFDocument::widget() const
 {
-    return TQT_TQWIDGET(tqparent());
+    return TQT_TQWIDGET(parent());
 }
 
 bool KPDFDocument::isOpened() const

kpdf/core/generator_pdf/generator_pdf.cpp

@@ -856,7 +856,7 @@ TQString PDFGenerator::getDocumentDate( const TQString & data ) const
     return result;
 }
 
-void PDFGenerator::addSynopsisChildren( TQDomNode * tqparent, GList * items )
+void PDFGenerator::addSynopsisChildren( TQDomNode * parent, GList * items )
 {
     int numItems = items->getLength();
     for ( int i = 0; i < numItems; ++i )
@@ -872,7 +872,7 @@ void PDFGenerator::addSynopsisChildren( TQDomNode * tqparent, GList * items )
         if ( name.isEmpty() )
             continue;
         TQDomElement item = docSyn.createElement( name );
-        tqparent->appendChild( item );
+        parent->appendChild( item );
 
         // 2. find the page the link refers to
         LinkAction * a = outlineItem->getAction();

kpdf/core/generator_pdf/generator_pdf.h

@@ -95,7 +95,7 @@ class PDFGenerator : public Generator
         TQString getDocumentInfo( const TQString & data, bool canReturnNull = false ) const;
         TQString getDocumentDate( const TQString & data ) const;
         // private function for creating the document synopsis hieracy
-        void addSynopsisChildren( TQDomNode * tqparent, GList * items );
+        void addSynopsisChildren( TQDomNode * parent, GList * items );
         // private function for creating the transition information
         void addTransition( int pageNumber, KPDFPage * page );
         // (async related) receive data from the generator thread

kpdf/core/generator_pdf/gp_outputdev.h

@@ -32,7 +32,7 @@ class DocumentViewport;
  * @short A SplashOutputDev renderer that grabs text and links.
  *
  * This output device:
- * - renders the page using SplashOutputDev (its tqparent)
+ * - renders the page using SplashOutputDev (its parent)
  * - harvests text into a textPage (for searching text)
  * - harvests links and collects them
  * - collects images and collects them

kpdf/part.cpp

@@ -114,9 +114,9 @@ using namespace KPDF;
 unsigned int Part::m_count = 0;
 
 Part::Part(TQWidget *parentWidget, const char *widgetName,
-           TQObject *tqparent, const char *name,
+           TQObject *parent, const char *name,
            const TQStringList & /*args*/ )
-	: DCOPObject("kpdf"), KParts::ReadOnlyPart(tqparent, name), m_showMenuBarAction(0), m_showFullScreenAction(0),
+	: DCOPObject("kpdf"), KParts::ReadOnlyPart(parent, name), m_showMenuBarAction(0), m_showFullScreenAction(0),
 	m_actionsSearched(false), m_searchStarted(false)
 {
 	// connect the started signal to tell the job the mimetypes we like
@@ -151,8 +151,8 @@ Part::Part(TQWidget *parentWidget, const char *widgetName,
 	connect( m_document, TQT_SIGNAL( openURL(const KURL &) ), this, TQT_SLOT( openURLFromDocument(const KURL &) ) );
 	connect( m_document, TQT_SIGNAL( close() ), this, TQT_SLOT( close() ) );
 	
-	if (tqparent && tqparent->tqmetaObject()->slotNames(true).contains("slotQuit()"))
+	if (parent && parent->tqmetaObject()->slotNames(true).contains("slotQuit()"))
-		connect( m_document, TQT_SIGNAL( quit() ), tqparent, TQT_SLOT( slotQuit() ) );
+		connect( m_document, TQT_SIGNAL( quit() ), parent, TQT_SLOT( slotQuit() ) );
 	else
 		connect( m_document, TQT_SIGNAL( quit() ), this, TQT_SLOT( cannotQuit() ) );
 
@@ -634,7 +634,7 @@ void Part::slotDoFileDirty()
 
 void Part::close()
 {
-  if (tqparent() && strcmp(tqparent()->name(), "KPDF::Shell") == 0)
+  if (parent() && strcmp(parent()->name(), "KPDF::Shell") == 0)
   {
     closeURL();
   }
@@ -1085,8 +1085,8 @@ void Part::saveDocumentRestoreInfo(KConfig* config)
 /*
 * BrowserExtension class
 */
-BrowserExtension::BrowserExtension(Part* tqparent)
+BrowserExtension::BrowserExtension(Part* parent)
-  : KParts::BrowserExtension( tqparent, "KPDF::BrowserExtension" )
+  : KParts::BrowserExtension( parent, "KPDF::BrowserExtension" )
 {
 	emit enableAction("print", true);
 	setURLDropHandlingEnabled(true);
@@ -1094,7 +1094,7 @@ BrowserExtension::BrowserExtension(Part* tqparent)
 
 void BrowserExtension::print()
 {
-	static_cast<Part*>(tqparent())->slotPrint();
+	static_cast<Part*>(parent())->slotPrint();
 }
 
 #include "part.moc"

kpdf/part.h

@@ -64,7 +64,7 @@ Q_OBJECT
 public:
 	// Default constructor
 	Part(TQWidget* parentWidget, const char* widgetName,
-	     TQObject* tqparent, const char* name, const TQStringList& args);
+	     TQObject* parent, const char* name, const TQStringList& args);
 
 	// Destructor
 	~Part();

kpdf/ui/minibar.cpp

@@ -28,7 +28,7 @@
 class ProgressWidget : public TQWidget
 {
     public:
-        ProgressWidget( MiniBar * tqparent );
+        ProgressWidget( MiniBar * parent );
         void setProgress( float percentage );
 
     protected:
@@ -46,7 +46,7 @@ class ProgressWidget : public TQWidget
 class PagesEdit : public TQLineEdit
 {
     public:
-        PagesEdit( MiniBar * tqparent );
+        PagesEdit( MiniBar * parent );
         void setPagesNumber( int pages );
         void setText( const TQString & );
 
@@ -67,7 +67,7 @@ class PagesEdit : public TQLineEdit
 class HoverButton : public TQPushButton
 {
     public:
-        HoverButton( TQWidget * tqparent );
+        HoverButton( TQWidget * parent );
 
     protected:
         void paintEvent( TQPaintEvent * e );
@@ -78,8 +78,8 @@ class HoverButton : public TQPushButton
 
 /** MiniBar **/
 
-MiniBar::MiniBar( TQWidget * tqparent, KPDFDocument * document )
+MiniBar::MiniBar( TQWidget * parent, KPDFDocument * document )
-    : TQFrame( tqparent, "miniBar" ), m_document( document ),
+    : TQFrame( parent, "miniBar" ), m_document( document ),
     m_currentPage( -1 )
 {
     // left spacer
@@ -127,7 +127,7 @@ MiniBar::MiniBar( TQWidget * tqparent, KPDFDocument * document )
     connect( m_nextButton, TQT_SIGNAL( clicked() ), this, TQT_SIGNAL( nextPage() ) );
 
     // widget starts hidden (will be shown after opening a document)
-    tqparent->hide();
+    parent->hide();
 }
 
 MiniBar::~MiniBar()
@@ -146,7 +146,7 @@ void MiniBar::notifySetup( const TQValueVector< KPDFPage * > & pageVector, bool
     if ( pages < 1 )
     {
         m_currentPage = -1;
-        TQT_TQWIDGET( tqparent() )->hide();
+        TQT_TQWIDGET( parent() )->hide();
         return;
     }
 
@@ -171,7 +171,7 @@ void MiniBar::notifySetup( const TQValueVector< KPDFPage * > & pageVector, bool
     m_pagesButton->setText( TQString::number( pages ) );
     m_prevButton->setEnabled( false );
     m_nextButton->setEnabled( false );
-    TQT_TQWIDGET( tqparent() )->show();
+    TQT_TQWIDGET( parent() )->show();
 }
 
 void MiniBar::notifyViewportChanged( bool /*smoothMove*/ )
@@ -259,9 +259,9 @@ void MiniBar::slotEmitPrevPage()
 
 /** ProgressWidget **/
 
-ProgressWidget::ProgressWidget( MiniBar * tqparent )
+ProgressWidget::ProgressWidget( MiniBar * parent )
-    : TQWidget( tqparent, "progress", WNoAutoErase ),
+    : TQWidget( parent, "progress", WNoAutoErase ),
-    m_miniBar( tqparent ), m_progressPercentage( -1 )
+    m_miniBar( parent ), m_progressPercentage( -1 )
 {
     setFixedHeight( 4 );
     setMouseTracking( true );
@@ -325,8 +325,8 @@ void ProgressWidget::paintEvent( TQPaintEvent * e )
 
 /** PagesEdit **/
 
-PagesEdit::PagesEdit( MiniBar * tqparent )
+PagesEdit::PagesEdit( MiniBar * parent )
-    : TQLineEdit( tqparent ), m_miniBar( tqparent ), m_eatClick( false )
+    : TQLineEdit( parent ), m_miniBar( parent ), m_eatClick( false )
 {
     // customize look
     setFrameShadow( TQFrame::Raised );
@@ -398,8 +398,8 @@ void PagesEdit::wheelEvent( TQWheelEvent * e )
 
 /** HoverButton **/
 
-HoverButton::HoverButton( TQWidget * tqparent )
+HoverButton::HoverButton( TQWidget * parent )
-    : TQPushButton( tqparent )
+    : TQPushButton( parent )
 {
     setMouseTracking( true );
 #if KDE_IS_VERSION(3,3,90)

kpdf/ui/minibar.h

@@ -27,7 +27,7 @@ class MiniBar : public TQFrame, public DocumentObserver
     Q_OBJECT
   TQ_OBJECT
     public:
-        MiniBar( TQWidget *tqparent, KPDFDocument * document );
+        MiniBar( TQWidget *parent, KPDFDocument * document );
         ~MiniBar();
 
         // [INHERITED] from DocumentObserver

kpdf/ui/pageview.cpp

@@ -178,8 +178,8 @@ void PageViewTip::maybeTip( const TQPoint &_p )
  *  other misc functions: only slotRequestVisiblePixmaps and pickItemOnPoint noticeable,
  * and many insignificant stuff like this comment :-)
  */
-PageView::PageView( TQWidget *tqparent, KPDFDocument *document )
+PageView::PageView( TQWidget *parent, KPDFDocument *document )
-    : TQScrollView( tqparent, "KPDF::pageView", WStaticContents | WNoAutoErase )
+    : TQScrollView( parent, "KPDF::pageView", WStaticContents | WNoAutoErase )
 {
     // create and initialize private storage structure
     d = new PageViewPrivate();

kpdf/ui/pageview.h

@@ -44,7 +44,7 @@ class PageView : public TQScrollView, public DocumentObserver
         friend class PageViewTip;
 
     public:
-        PageView( TQWidget *tqparent, KPDFDocument *document );
+        PageView( TQWidget *parent, KPDFDocument *document );
         ~PageView();
 
         // Zoom mode ( last 4 are internally used only! )

kpdf/ui/pageviewutils.cpp

@@ -21,8 +21,8 @@
 #include "core/page.h"
 #include "conf/settings.h"
 
-PageViewMessage::PageViewMessage( TQWidget * tqparent )
+PageViewMessage::PageViewMessage( TQWidget * parent )
-    : TQWidget( tqparent, "pageViewMessage" ), m_timer( 0 )
+    : TQWidget( parent, "pageViewMessage" ), m_timer( 0 )
 {
     setFocusPolicy( TQ_NoFocus );
     setBackgroundMode( NoBackground );
@@ -86,18 +86,18 @@ void PageViewMessage::display( const TQString & message, Icon icon, int duration
     }
     TQRect tqgeometry( 0, 0, width + 10, height + 8 );
 
-    // resize pixmap, tqmask and widget
+    // resize pixmap, mask and widget
-    static TQBitmap tqmask;
+    static TQBitmap mask;
-    tqmask.resize( tqgeometry.size() );
+    mask.resize( tqgeometry.size() );
     m_pixmap.resize( tqgeometry.size() );
     resize( tqgeometry.size() );
 
-    // create and set transparency tqmask
+    // create and set transparency mask
-    TQPainter maskPainter( &tqmask);
+    TQPainter maskPainter( &mask);
-    tqmask.fill( TQt::black );
+    mask.fill( TQt::black );
     maskPainter.setBrush( TQt::white );
     maskPainter.drawRoundRect( tqgeometry, 1600 / tqgeometry.width(), 1600 / tqgeometry.height() );
-    setMask( tqmask );
+    setMask( mask );
 
     // draw background
     TQPainter bufferPainter( &m_pixmap );

kpdf/ui/pageviewutils.h

@@ -55,7 +55,7 @@ class PageViewItem
 class PageViewMessage : public TQWidget
 {
     public:
-        PageViewMessage( TQWidget * tqparent );
+        PageViewMessage( TQWidget * parent );
 
         enum Icon { None, Info, Warning, Error, Find };
         void display( const TQString & message, Icon icon = Info, int durationMs = 4000 );

kpdf/ui/presentationwidget.cpp

@@ -52,8 +52,8 @@ struct PresentationFrame
 };
 
 
-PresentationWidget::PresentationWidget( TQWidget * tqparent, KPDFDocument * doc )
+PresentationWidget::PresentationWidget( TQWidget * parent, KPDFDocument * doc )
-    : TQDialog( tqparent, "presentationWidget", true, WDestructiveClose | WStyle_NoBorder),
+    : TQDialog( parent, "presentationWidget", true, WDestructiveClose | WStyle_NoBorder),
     m_pressedLink( 0 ), m_handCursor( false ), m_document( doc ), m_frameIndex( -1 )
 {
     // set look and tqgeometry

kpdf/ui/presentationwidget.h

@@ -37,7 +37,7 @@ class PresentationWidget : public TQDialog, public DocumentObserver
     Q_OBJECT
   TQ_OBJECT
     public:
-        PresentationWidget( TQWidget * tqparent, KPDFDocument * doc );
+        PresentationWidget( TQWidget * parent, KPDFDocument * doc );
         ~PresentationWidget();
 
         void setupActions( KActionCollection * ac );

kpdf/ui/propertiesdialog.cpp

@@ -19,8 +19,8 @@
 #include "propertiesdialog.h"
 #include "core/document.h"
 
-PropertiesDialog::PropertiesDialog(TQWidget *tqparent, KPDFDocument *doc)
+PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc)
-  : KDialogBase( Tabbed, i18n( "Unknown File" ), Ok, Ok, tqparent, 0, true, true )
+  : KDialogBase( Tabbed, i18n( "Unknown File" ), Ok, Ok, parent, 0, true, true )
 {
   // Properties
   TQFrame *page = addPage(i18n("Properties"));

kpdf/ui/propertiesdialog.h

@@ -17,7 +17,7 @@ class KPDFDocument;
 class PropertiesDialog : public KDialogBase
 {
   public:
-  	PropertiesDialog( TQWidget *tqparent, KPDFDocument *doc );
+  	PropertiesDialog( TQWidget *parent, KPDFDocument *doc );
 };
 
 #endif

kpdf/ui/searchwidget.cpp

@@ -28,8 +28,8 @@
 #define LEDIT_ID    2
 #define FIND_ID     3
 
-SearchWidget::SearchWidget( TQWidget * tqparent, KPDFDocument * document )
+SearchWidget::SearchWidget( TQWidget * parent, KPDFDocument * document )
-    : KToolBar( tqparent, "iSearchBar" ), m_document( document ),
+    : KToolBar( parent, "iSearchBar" ), m_document( document ),
     m_searchType( 0 ), m_caseSensitive( false )
 {
     // change toolbar appearance

kpdf/ui/searchwidget.h

@@ -32,7 +32,7 @@ class SearchWidget : public KToolBar
     Q_OBJECT
   TQ_OBJECT
     public:
-        SearchWidget( TQWidget *tqparent, KPDFDocument *document );
+        SearchWidget( TQWidget *parent, KPDFDocument *document );
         void clearText();
 
     private:

kpdf/ui/thumbnaillist.cpp

@@ -30,7 +30,7 @@
 class ThumbnailWidget : public TQWidget
 {
     public:
-        ThumbnailWidget( TQWidget * tqparent, const KPDFPage * page, ThumbnailList * tl );
+        ThumbnailWidget( TQWidget * parent, const KPDFPage * page, ThumbnailList * tl );
 
         // set internal parameters to fit the page in the given width
         void resizeFitWidth( int width );
@@ -63,8 +63,8 @@ class ThumbnailWidget : public TQWidget
 
 /** ThumbnailList implementation **/
 
-ThumbnailList::ThumbnailList( TQWidget *tqparent, KPDFDocument *document )
+ThumbnailList::ThumbnailList( TQWidget *parent, KPDFDocument *document )
-	: TQScrollView( tqparent, "KPDF::Thumbnails", WNoAutoErase | WStaticContents ),
+	: TQScrollView( parent, "KPDF::Thumbnails", WNoAutoErase | WStaticContents ),
 	m_document( document ), m_selected( 0 ), m_delayTimer( 0 ), m_bookmarkOverlay( 0 )
 {
 	// set scrollbars
@@ -452,8 +452,8 @@ void ThumbnailList::delayedRequestVisiblePixmaps( int delayMs )
 
 /** ThumbnailWidget implementation **/
 
-ThumbnailWidget::ThumbnailWidget( TQWidget * tqparent, const KPDFPage * kp, ThumbnailList * tl )
+ThumbnailWidget::ThumbnailWidget( TQWidget * parent, const KPDFPage * kp, ThumbnailList * tl )
-    : TQWidget( tqparent, 0, WNoAutoErase ), m_tl( tl ), m_page( kp ),
+    : TQWidget( parent, 0, WNoAutoErase ), m_tl( tl ), m_page( kp ),
     m_selected( false ), m_pixmapWidth( 10 ), m_pixmapHeight( 10 )
 {
     m_labelNumber = m_page->number() + 1;
@@ -552,8 +552,8 @@ void ThumbnailWidget::paintEvent( TQPaintEvent * e )
 
 #define FILTERB_ID  1
 
-ThumbnailController::ThumbnailController( TQWidget * tqparent, ThumbnailList * list )
+ThumbnailController::ThumbnailController( TQWidget * parent, ThumbnailList * list )
-    : KToolBar( tqparent, "ThumbsControlBar" )
+    : KToolBar( parent, "ThumbsControlBar" )
 {
     // change toolbar appearance
     setMargin( 3 );

kpdf/ui/thumbnaillist.h

@@ -32,7 +32,7 @@ class ThumbnailList : public TQScrollView, public DocumentObserver
 Q_OBJECT
   TQ_OBJECT
 	public:
-		ThumbnailList(TQWidget *tqparent, KPDFDocument *document);
+		ThumbnailList(TQWidget *parent, KPDFDocument *document);
 		~ThumbnailList();
 
         // inherited: return thumbnails observer id
@@ -101,7 +101,7 @@ Q_OBJECT
 class ThumbnailsBox : public TQVBox
 {
 	public:
-		ThumbnailsBox( TQWidget * tqparent ) : TQVBox( tqparent ) {};
+		ThumbnailsBox( TQWidget * parent ) : TQVBox( parent ) {};
 		TQSize tqsizeHint() const { return TQSize(); }
 };
 
@@ -116,7 +116,7 @@ class ThumbnailsBox : public TQVBox
 class ThumbnailController : public KToolBar
 {
     public:
-        ThumbnailController( TQWidget * tqparent, ThumbnailList * thumbnailList );
+        ThumbnailController( TQWidget * parent, ThumbnailList * thumbnailList );
 };
 
 #endif

kpdf/ui/toc.cpp

@@ -25,8 +25,8 @@
 class TOCItem : public KListViewItem
 {
     public:
-        TOCItem( KListView *tqparent, TOCItem *after, const TQDomElement & e )
+        TOCItem( KListView *parent, TOCItem *after, const TQDomElement & e )
-            : KListViewItem( tqparent, after, e.tagName() ), m_element( e )
+            : KListViewItem( parent, after, e.tagName() ), m_element( e )
         {
 #ifdef TOC_ENABLE_PAGE_COLUMN
             if ( e.hasAttribute( "Page" ) )
@@ -35,8 +35,8 @@ class TOCItem : public KListViewItem
             setMultiLinesEnabled(true);
         }
 
-        TOCItem( KListViewItem *tqparent, TOCItem *after, const TQDomElement & e )
+        TOCItem( KListViewItem *parent, TOCItem *after, const TQDomElement & e )
-            : KListViewItem( tqparent, after, e.tagName() ), m_element( e )
+            : KListViewItem( parent, after, e.tagName() ), m_element( e )
         {
 #ifdef TOC_ENABLE_PAGE_COLUMN
             if ( e.hasAttribute( "Page" ) )
@@ -54,7 +54,7 @@ class TOCItem : public KListViewItem
         TQDomElement m_element;
 };
 
-TOC::TOC(TQWidget *tqparent, KPDFDocument *document) : KListView(tqparent), m_document(document)
+TOC::TOC(TQWidget *parent, KPDFDocument *document) : KListView(parent), m_document(document)
 {
     addColumn( i18n("Topic") );
 #ifdef TOC_ENABLE_PAGE_COLUMN

kpdf/ui/toc.h

@@ -22,7 +22,7 @@ class TOC : public KListView, public DocumentObserver
 Q_OBJECT
   TQ_OBJECT
     public:
-        TOC(TQWidget *tqparent, KPDFDocument *document);
+        TOC(TQWidget *parent, KPDFDocument *document);
         ~TOC();
 
         // inherited from DocumentObserver

kpovmodeler/baseinsertrules.xml

@@ -166,7 +166,7 @@
     </rule>
     <rule>
       <group name="ObjectModifier"/>
-      <not><tqparent><class name="Mesh"/></tqparent></not>
+      <not><parent><class name="Mesh"/></parent></not>
     </rule>
   </targetclass>
 

kpovmodeler/pmactions.cpp

@@ -34,8 +34,8 @@
 class PMComboBox : public TQComboBox
 {
 public:
-   PMComboBox( TQWidget* tqparent, const char* name = 0 )
+   PMComboBox( TQWidget* parent, const char* name = 0 )
-         : TQComboBox( tqparent, name )
+         : TQComboBox( parent, name )
    {
    }
 
@@ -52,8 +52,8 @@ public:
 };
 
 PMComboAction::PMComboAction( const TQString& text, int accel, const TQObject* receiver, const char* member,
-                              TQObject* tqparent, const char* name )
+                              TQObject* parent, const char* name )
-      : KAction( text, accel, tqparent, name )
+      : KAction( text, accel, parent, name )
 {
    m_receiver = receiver;
    m_member = member;
@@ -120,8 +120,8 @@ void PMComboAction::unplug( TQWidget *w )
 class PMToolBarLabel : public TQToolButton
 {
 public:
-   PMToolBarLabel( const TQString& text, TQWidget* tqparent = 0, const char* name = 0 )
+   PMToolBarLabel( const TQString& text, TQWidget* parent = 0, const char* name = 0 )
-         : TQToolButton( tqparent, name )
+         : TQToolButton( parent, name )
    {
       setText( text );
    }
@@ -143,8 +143,8 @@ protected:
    }
 };
 
-PMLabelAction::PMLabelAction( const TQString &text, TQObject *tqparent, const char *name )
+PMLabelAction::PMLabelAction( const TQString &text, TQObject *parent, const char *name )
-    : KAction( text, 0, tqparent, name )
+    : KAction( text, 0, parent, name )
 {
    m_button = 0;
 }
@@ -193,8 +193,8 @@ void PMLabelAction::unplug( TQWidget *widget )
 
 
 PMSpinBoxAction::PMSpinBoxAction( const TQString& text, int accel, const TQObject* receiver, const char* member,
-                                  TQObject* tqparent, const char* name )
+                                  TQObject* parent, const char* name )
-      : KAction( text, accel, tqparent, name )
+      : KAction( text, accel, parent, name )
 {
    m_receiver = receiver;
    m_member = member;

kpovmodeler/pmactions.h

@@ -38,7 +38,7 @@ class PMComboAction : public KAction
    Q_OBJECT
   TQ_OBJECT
 public:
-   PMComboAction( const TQString& text, int accel, const TQObject* receiver, const char* member, TQObject* tqparent, const char* name );
+   PMComboAction( const TQString& text, int accel, const TQObject* receiver, const char* member, TQObject* parent, const char* name );
    ~PMComboAction( );
    
    virtual int plug( TQWidget* w, int index = -1 );
@@ -70,7 +70,7 @@ class PMLabelAction : public KAction
    Q_OBJECT
   TQ_OBJECT
 public:
-   PMLabelAction( const TQString &text, TQObject *tqparent = 0, const char *name = 0 );
+   PMLabelAction( const TQString &text, TQObject *parent = 0, const char *name = 0 );
    
    virtual int plug( TQWidget *widget, int index = -1 );
    virtual void unplug( TQWidget *widget );
@@ -88,7 +88,7 @@ class PMSpinBoxAction : public KAction
    Q_OBJECT
   TQ_OBJECT
 public:
-   PMSpinBoxAction( const TQString& text, int accel, const TQObject* receiver, const char* member, TQObject* tqparent, const char* name );
+   PMSpinBoxAction( const TQString& text, int accel, const TQObject* receiver, const char* member, TQObject* parent, const char* name );
    ~PMSpinBoxAction( );
    
    virtual int plug( TQWidget* w, int index = -1 );

kpovmodeler/pmaddcommand.cpp

@@ -26,11 +26,11 @@
 
 #include <klocale.h>
 
-PMAddCommand::PMAddCommand( PMObject* obj, PMObject* tqparent, PMObject* after )
+PMAddCommand::PMAddCommand( PMObject* obj, PMObject* parent, PMObject* after )
       : PMCommand( i18n( "Add New %1" ).tqarg( obj->description( ) ) )
 {
    m_objects.append( obj );
-   m_pParent = tqparent;
+   m_pParent = parent;
    m_pAfter = after;
    m_executed = false;
    m_firstExecution = true;
@@ -38,12 +38,12 @@ PMAddCommand::PMAddCommand( PMObject* obj, PMObject* tqparent, PMObject* after )
    m_pParentChangeMemento = 0;
 }
 
-PMAddCommand::PMAddCommand( const PMObjectList& list, PMObject* tqparent,
+PMAddCommand::PMAddCommand( const PMObjectList& list, PMObject* parent,
                             PMObject* after )
       : PMCommand( i18n( "Add Objects" ) )
 {
    m_objects = list;
-   m_pParent = tqparent;
+   m_pParent = parent;
    m_pAfter = after;
    m_executed = false;
    m_firstExecution = true;
@@ -116,8 +116,8 @@ void PMAddCommand::execute( PMCommandManager* theManager )
                for( ; links.current( ); ++links )
                {
                   PMObject* l = links.current( );
-                  if( l->tqparent( ) )
+                  if( l->parent( ) )
-                     l->tqparent( )->takeChild( l );
+                     l->parent( )->takeChild( l );
                   else
                      m_objects.removeRef( l );
                   m_insertErrors.append( l );
@@ -204,8 +204,8 @@ void PMAddCommand::undo( PMCommandManager* theManager )
          // signal has to be emitted before the item is removed
          theManager->cmdObjectChanged( obj, PMCRemove );
 
-         if( obj->tqparent( ) )
+         if( obj->parent( ) )
-            obj->tqparent( )->takeChild( obj );
+            obj->parent( )->takeChild( obj );
       }
 
       if( m_pParentChangeMemento )

kpovmodeler/pmaddcommand.h

@@ -38,22 +38,22 @@ public:
    /**
     * Command that adds a new PMObject.
     *
-    * The object obj will be inserted as child of tqparent after
+    * The object obj will be inserted as child of parent after
     * the object after.
     *
     * If after is 0, the object becomes the first child.
     */
-   PMAddCommand( PMObject* obj, PMObject* tqparent, PMObject* after );
+   PMAddCommand( PMObject* obj, PMObject* parent, PMObject* after );
    
    /**
     * Command that adds a list of new PMObjects.
     *
-    * The object in the list will be inserted as tqchildren of tqparent after
+    * The object in the list will be inserted as tqchildren of parent after
     * the object after.
     *
     * If after is 0, the objects will be inserted as first tqchildren.
     */
-   PMAddCommand( const PMObjectList& list, PMObject* tqparent, PMObject* after );
+   PMAddCommand( const PMObjectList& list, PMObject* parent, PMObject* after );
    /**
     * Deletes the command. The inserted object will be deleted, if
     the command was not executed (or undo-ed) */

kpovmodeler/pmbicubicpatch.cpp

@@ -365,9 +365,9 @@ PMVector PMBicubicPatch::uvVector( int i ) const
    return PMVector( 0.0, 0.0 );
 }
 
-PMDialogEditBase* PMBicubicPatch::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMBicubicPatch::editWidget( TQWidget* parent ) const
 {
-   return new PMBicubicPatchEdit( tqparent );
+   return new PMBicubicPatchEdit( parent );
 }
 
 void PMBicubicPatch::restoreMemento( PMMemento* s )

kpovmodeler/pmbicubicpatch.h

@@ -66,7 +66,7 @@ public:
    /**
     * Returns a new @ref PMBicubicPatchEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /**
     * Returns the name of the pixmap that is displayed in the tree view
     * and dialog view

kpovmodeler/pmbicubicpatchedit.cpp

@@ -29,8 +29,8 @@
 #include <tqcheckbox.h>
 #include <klocale.h>
 
-PMBicubicPatchEdit::PMBicubicPatchEdit( TQWidget* tqparent, const char* name )
+PMBicubicPatchEdit::PMBicubicPatchEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmbicubicpatchedit.h

@@ -43,9 +43,9 @@ class PMBicubicPatchEdit : public PMGraphicalObjectEdit
    typedef PMGraphicalObjectEdit Base;
 public:
    /**
-    * Creates a PMBicubicPatchEdit with tqparent and name
+    * Creates a PMBicubicPatchEdit with parent and name
     */
-   PMBicubicPatchEdit( TQWidget* tqparent, const char* name = 0 );
+   PMBicubicPatchEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmblendmapmodifiers.cpp

@@ -236,9 +236,9 @@ void PMBlendMapModifiers::setWaveFormType( PMWaveFormType c )
    }
 }
 
-PMDialogEditBase* PMBlendMapModifiers::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMBlendMapModifiers::editWidget( TQWidget* parent ) const
 {
-   return new PMBlendMapModifiersEdit( tqparent );
+   return new PMBlendMapModifiersEdit( parent );
 }
 
 void PMBlendMapModifiers::restoreMemento( PMMemento* s )

kpovmodeler/pmblendmapmodifiers.h

@@ -69,7 +69,7 @@ public:
    /**
     * Returns a new @ref PMBlendMapModifiersEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /** */
    virtual TQString pixmap( ) const { return TQString( "pmblendmapmodifiers" ); }
 

kpovmodeler/pmblendmapmodifiersedit.cpp

@@ -37,8 +37,8 @@
 #include <kdialog.h>
 #include <kfiledialog.h>
 
-PMBlendMapModifiersEdit::PMBlendMapModifiersEdit( TQWidget* tqparent, const char* name )
+PMBlendMapModifiersEdit::PMBlendMapModifiersEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmblendmapmodifiersedit.h

@@ -47,9 +47,9 @@ class PMBlendMapModifiersEdit : public PMDialogEditBase
    typedef PMDialogEditBase Base;
 public:
    /**
-    * Creates a PMBlendMapModifiersEdit with tqparent and name
+    * Creates a PMBlendMapModifiersEdit with parent and name
     */
-   PMBlendMapModifiersEdit( TQWidget* tqparent, const char* name = 0 );
+   PMBlendMapModifiersEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmblob.cpp

@@ -139,9 +139,9 @@ void PMBlob::setHierarchy( bool h )
    }
 }
 
-PMDialogEditBase* PMBlob::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMBlob::editWidget( TQWidget* parent ) const
 {
-   return new PMBlobEdit( tqparent );
+   return new PMBlobEdit( parent );
 }
 
 void PMBlob::restoreMemento( PMMemento* s )

kpovmodeler/pmblob.h

@@ -63,7 +63,7 @@ public:
    /**
     * Returns a new @ref PMBlobEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /**
     * Returns the name of the pixmap that is displayed in the tree view
     * and dialog view

kpovmodeler/pmblobcylinder.cpp

@@ -160,9 +160,9 @@ void PMBlobCylinder::setStrength( double s )
    }
 }
 
-PMDialogEditBase* PMBlobCylinder::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMBlobCylinder::editWidget( TQWidget* parent ) const
 {
-   return new PMBlobCylinderEdit( tqparent );
+   return new PMBlobCylinderEdit( parent );
 }
 
 void PMBlobCylinder::restoreMemento( PMMemento* s )

kpovmodeler/pmblobcylinder.h

@@ -66,7 +66,7 @@ public:
    /**
     * Returns a new @ref PMBlobCylinderEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /**
     * Returns the name of the pixmap that is displayed in the tree view and dialog view
     */

kpovmodeler/pmblobcylinderedit.cpp

@@ -26,8 +26,8 @@
 #include <klocale.h>
 #include <tqcheckbox.h>
 
-PMBlobCylinderEdit::PMBlobCylinderEdit( TQWidget* tqparent, const char* name )
+PMBlobCylinderEdit::PMBlobCylinderEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmblobcylinderedit.h

@@ -37,9 +37,9 @@ class PMBlobCylinderEdit : public PMDetailObjectEdit
    typedef PMDetailObjectEdit Base;
 public:
    /**
-    * Creates a PMBlobCylinderEdit with tqparent and name
+    * Creates a PMBlobCylinderEdit with parent and name
     */
-   PMBlobCylinderEdit( TQWidget* tqparent, const char* name = 0 );
+   PMBlobCylinderEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmblobedit.cpp

@@ -25,8 +25,8 @@
 #include <tqcheckbox.h>
 #include <klocale.h>
 
-PMBlobEdit::PMBlobEdit( TQWidget* tqparent, const char* name )
+PMBlobEdit::PMBlobEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmblobedit.h

@@ -40,9 +40,9 @@ class PMBlobEdit : public PMSolidObjectEdit
    typedef PMSolidObjectEdit Base;
 public:
    /**
-    * Creates a PMBlobEdit with tqparent and name
+    * Creates a PMBlobEdit with parent and name
     */
-   PMBlobEdit( TQWidget* tqparent, const char* name = 0 );
+   PMBlobEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmblobsphere.cpp

@@ -107,9 +107,9 @@ void PMBlobSphere::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMDialogEditBase* PMBlobSphere::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMBlobSphere::editWidget( TQWidget* parent ) const
 {
-   return new PMBlobSphereEdit( tqparent );
+   return new PMBlobSphereEdit( parent );
 }
 
 void PMBlobSphere::restoreMemento( PMMemento* s )

kpovmodeler/pmblobsphere.h

@@ -64,7 +64,7 @@ public:
    /**
     * Returns a new @ref PMBlobSphereEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /**
     * Returns the name of the pixmap that is displayed in the tree view
     * and dialog view

kpovmodeler/pmblobsphereedit.cpp

@@ -24,8 +24,8 @@
 #include <tqlabel.h>
 #include <klocale.h>
 
-PMBlobSphereEdit::PMBlobSphereEdit( TQWidget* tqparent, const char* name )
+PMBlobSphereEdit::PMBlobSphereEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmblobsphereedit.h

@@ -38,9 +38,9 @@ class PMBlobSphereEdit : public PMDetailObjectEdit
    typedef PMDetailObjectEdit Base;
 public:
    /**
-    * Creates a PMBlobSphereEdit with tqparent and name
+    * Creates a PMBlobSphereEdit with parent and name
     */
-   PMBlobSphereEdit( TQWidget* tqparent, const char* name = 0 );
+   PMBlobSphereEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmboundedby.cpp

@@ -91,9 +91,9 @@ void PMBoundedBy::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMDialogEditBase* PMBoundedBy::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMBoundedBy::editWidget( TQWidget* parent ) const
 {
-   return new PMBoundedByEdit( tqparent );
+   return new PMBoundedByEdit( parent );
 }
 
 void PMBoundedBy::childRemoved( PMObject* o )

kpovmodeler/pmboundedby.h

@@ -64,7 +64,7 @@ public:
    /**
     * Returns a new @ref PMBoundedByEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /**
     * Returns the name of the pixmap that is displayed in the tree view
     * and dialog view

kpovmodeler/pmboundedbyedit.cpp

@@ -23,8 +23,8 @@
 #include <tqlabel.h>
 #include <klocale.h>
 
-PMBoundedByEdit::PMBoundedByEdit( TQWidget* tqparent, const char* name )
+PMBoundedByEdit::PMBoundedByEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmboundedbyedit.h

@@ -39,9 +39,9 @@ class PMBoundedByEdit : public PMDialogEditBase
    typedef PMDialogEditBase Base;
 public:
    /**
-    * Creates a PMBoundedByEdit with tqparent and name
+    * Creates a PMBoundedByEdit with parent and name
     */
-   PMBoundedByEdit( TQWidget* tqparent, const char* name = 0 );
+   PMBoundedByEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmbox.cpp

@@ -114,9 +114,9 @@ void PMBox::setCorner2( const PMVector& p )
    }
 }
 
-PMDialogEditBase* PMBox::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMBox::editWidget( TQWidget* parent ) const
 {
-   return new PMBoxEdit( tqparent );
+   return new PMBoxEdit( parent );
 }
 
 void PMBox::restoreMemento( PMMemento* s )

kpovmodeler/pmbox.h

@@ -65,7 +65,7 @@ public:
    /**
     * Returns a new @ref PMBoxEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /**
     * Returns the name of the pixmap that is displayed in the tree view
     * and dialog view

kpovmodeler/pmboxedit.cpp

@@ -24,8 +24,8 @@
 #include <tqlabel.h>
 #include <klocale.h>
 
-PMBoxEdit::PMBoxEdit( TQWidget* tqparent, const char* name )
+PMBoxEdit::PMBoxEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmboxedit.h

@@ -39,9 +39,9 @@ class PMBoxEdit : public PMSolidObjectEdit
    typedef PMSolidObjectEdit Base;
 public:
    /**
-    * Creates a PMBoxEdit with tqparent and name
+    * Creates a PMBoxEdit with parent and name
     */
-   PMBoxEdit( TQWidget* tqparent, const char* name = 0 );
+   PMBoxEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmbumpmap.cpp

@@ -336,9 +336,9 @@ void PMBumpMap::setBumpSize( double c )
    }
 }
 
-PMDialogEditBase* PMBumpMap::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMBumpMap::editWidget( TQWidget* parent ) const
 {
-   return new PMBumpMapEdit( tqparent );
+   return new PMBumpMapEdit( parent );
 }
 
 void PMBumpMap::restoreMemento( PMMemento* s )

kpovmodeler/pmbumpmap.h

@@ -87,7 +87,7 @@ public:
    /**
     * Returns a new @ref PMBumpMapEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
 
    /**
     * Gets the bitmap type

kpovmodeler/pmbumpmapedit.cpp

@@ -38,8 +38,8 @@
 #include <kfiledialog.h>
 #include <kiconloader.h>
 
-PMBumpMapEdit::PMBumpMapEdit( TQWidget* tqparent, const char* name )
+PMBumpMapEdit::PMBumpMapEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmbumpmapedit.h

@@ -49,9 +49,9 @@ class PMBumpMapEdit : public PMDialogEditBase
    typedef PMDialogEditBase Base;
 public:
    /**
-    * Creates a PMBumpMapEdit with tqparent and name
+    * Creates a PMBumpMapEdit with parent and name
     */
-   PMBumpMapEdit( TQWidget* tqparent, const char* name = 0 );
+   PMBumpMapEdit( TQWidget* parent, const char* name = 0 );
    /** */
    virtual void displayObject( PMObject* o );
    /** */

kpovmodeler/pmcamera.cpp

@@ -443,9 +443,9 @@ void PMCamera::setExportPovray( bool ex )
    }
 }
 
-PMDialogEditBase* PMCamera::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMCamera::editWidget( TQWidget* parent ) const
 {
-   return new PMCameraEdit( tqparent );
+   return new PMCameraEdit( parent );
 }
 
 void PMCamera::restoreMemento( PMMemento* s )

kpovmodeler/pmcamera.h

@@ -70,7 +70,7 @@ public:
    /**
     * Returns a new @ref PMCameraEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /** */
    virtual TQString pixmap( ) const { return TQString( "pmcamera" ); }
 

kpovmodeler/pmcameraedit.cpp

@@ -30,8 +30,8 @@
 #include <kmessagebox.h>
 
 
-PMCameraEdit::PMCameraEdit( TQWidget* tqparent, const char* name )
+PMCameraEdit::PMCameraEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmcameraedit.h

@@ -45,9 +45,9 @@ class PMCameraEdit : public PMNamedObjectEdit
    typedef PMNamedObjectEdit Base;
 public:
    /**
-    * Creates a PMCameraEdit with tqparent and name
+    * Creates a PMCameraEdit with parent and name
     */
-   PMCameraEdit( TQWidget* tqparent, const char* name = 0 );
+   PMCameraEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmclippedby.cpp

@@ -91,9 +91,9 @@ void PMClippedBy::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMDialogEditBase* PMClippedBy::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMClippedBy::editWidget( TQWidget* parent ) const
 {
-   return new PMClippedByEdit( tqparent );
+   return new PMClippedByEdit( parent );
 }
 
 void PMClippedBy::childRemoved( PMObject* o )

kpovmodeler/pmclippedby.h

@@ -63,7 +63,7 @@ public:
    /**
     * Returns a new @ref PMClippedByEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /**
     * Returns the name of the pixmap that is displayed in the tree view
     * and dialog view

kpovmodeler/pmclippedbyedit.cpp

@@ -23,8 +23,8 @@
 #include <tqlabel.h>
 #include <klocale.h>
 
-PMClippedByEdit::PMClippedByEdit( TQWidget* tqparent, const char* name )
+PMClippedByEdit::PMClippedByEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmclippedbyedit.h

@@ -39,9 +39,9 @@ class PMClippedByEdit : public PMDialogEditBase
    typedef PMDialogEditBase Base;
 public:
    /**
-    * Creates a PMClippedByEdit with tqparent and name
+    * Creates a PMClippedByEdit with parent and name
     */
-   PMClippedByEdit( TQWidget* tqparent, const char* name = 0 );
+   PMClippedByEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmcoloredit.cpp

@@ -24,8 +24,8 @@
 #include <tqcolor.h>
 #include <kdialog.h>
 
-PMColorEdit::PMColorEdit( bool filterAndTransmit, TQWidget* tqparent, const char* name )
+PMColorEdit::PMColorEdit( bool filterAndTransmit, TQWidget* parent, const char* name )
-      : TQWidget( tqparent, name )
+      : TQWidget( parent, name )
 {
    m_bFilterAndTransmit = filterAndTransmit;
 

kpovmodeler/pmcoloredit.h

@@ -42,7 +42,7 @@ public:
    /**
     * Creates an edit widget for rgbft colors.
     */
-   PMColorEdit( bool filterAndTransmit, TQWidget* tqparent, const char* name = 0 );
+   PMColorEdit( bool filterAndTransmit, TQWidget* parent, const char* name = 0 );
    
    /**
     * Sets the displayed color

kpovmodeler/pmcolorsettings.cpp

@@ -25,8 +25,8 @@
 #include <kcolorbutton.h>
 #include <klocale.h>
 
-PMColorSettings::PMColorSettings( TQWidget* tqparent, const char* name )
+PMColorSettings::PMColorSettings( TQWidget* parent, const char* name )
-      : PMSettingsDialogPage( tqparent, name )
+      : PMSettingsDialogPage( parent, name )
 {
    TQHBoxLayout* htqlayout;
    TQVBoxLayout* vtqlayout;

kpovmodeler/pmcolorsettings.h

@@ -37,7 +37,7 @@ public:
    /**
     * Default constructor
     */
-   PMColorSettings( TQWidget* tqparent, const char* name = 0 );
+   PMColorSettings( TQWidget* parent, const char* name = 0 );
    /** */
    virtual void displaySettings( );
    /** */

kpovmodeler/pmcomment.cpp

@@ -143,9 +143,9 @@ void PMComment::readAttributes( const PMXMLHelper& h )
       m_text = e.toText( ).data( );
 }
 
-PMDialogEditBase* PMComment::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMComment::editWidget( TQWidget* parent ) const
 {
-   return new PMCommentEdit( tqparent );
+   return new PMCommentEdit( parent );
 }
 
 void PMComment::restoreMemento( PMMemento* s )

kpovmodeler/pmcomment.h

@@ -75,7 +75,7 @@ public:
    virtual void readAttributes( const PMXMLHelper& h );
 
    /** */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /** */
    virtual TQString pixmap( ) const { return TQString( "pmcomment" ); }
    /** */

kpovmodeler/pmcommentedit.cpp

@@ -23,8 +23,8 @@
 #include <tqmultilineedit.h>
 #include <kglobalsettings.h>
 
-PMCommentEdit::PMCommentEdit( TQWidget* tqparent, const char* name )
+PMCommentEdit::PMCommentEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmcommentedit.h

@@ -39,9 +39,9 @@ class PMCommentEdit : public PMDialogEditBase
    typedef PMDialogEditBase Base;
 public:
    /**
-    * Creates a PMCommentEdit with tqparent and name
+    * Creates a PMCommentEdit with parent and name
     */
-   PMCommentEdit( TQWidget* tqparent, const char* name = 0 );
+   PMCommentEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmcompositeobject.cpp

@@ -96,7 +96,7 @@ PMObject* PMCompositeObject::tqchildAt( uint index ) const
 
 int PMCompositeObject::findChild( PMObject* o )
 {
-   if( o->tqparent( ) != this )
+   if( o->parent( ) != this )
       return -1;
 
    PMObject* tmp;

kpovmodeler/pmcompositeobject.h

@@ -71,7 +71,7 @@ public:
     * Returns true if the object contains the child object o
     */
    virtual bool containsChild( PMObject* o ) const
-   { return ( ( PMObject* )this == o->tqparent( ) ); }
+   { return ( ( PMObject* )this == o->parent( ) ); }
    /**
     * Returns the index of the object or -1 if not found
     */
@@ -135,7 +135,7 @@ public:
 protected:
    /**
     * Adds num to the number of selected objects in this object and all
-    * tqparent objects. num can be negative.
+    * parent objects. num can be negative.
     */
    virtual void adjustSelectedChildren( int num );
 

kpovmodeler/pmcone.cpp

@@ -176,9 +176,9 @@ void PMCone::setOpen( bool op )
    }
 }
 
-PMDialogEditBase* PMCone::editWidget( TQWidget * tqparent ) const
+PMDialogEditBase* PMCone::editWidget( TQWidget * parent ) const
 {
-    return new PMConeEdit( tqparent );
+    return new PMConeEdit( parent );
 }
 
 void PMCone::restoreMemento( PMMemento * s )

kpovmodeler/pmcone.h

@@ -71,7 +71,7 @@ public:
    /**
     * Returns a new @ref PMConeEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /**
     * Returns the name of the pixmap that is displayed in the tree view and dialog view
     */

kpovmodeler/pmconeedit.cpp

@@ -26,8 +26,8 @@
 #include <klocale.h>
 #include <tqcheckbox.h>
 
-PMConeEdit::PMConeEdit( TQWidget* tqparent, const char* name )
+PMConeEdit::PMConeEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmconeedit.h

@@ -39,9 +39,9 @@ class PMConeEdit : public PMSolidObjectEdit
    typedef PMSolidObjectEdit Base;
 public:
    /**
-    * Creates a PMConeEdit with tqparent and name
+    * Creates a PMConeEdit with parent and name
     */
-   PMConeEdit( TQWidget* tqparent, const char* name = 0 );
+   PMConeEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmcsg.cpp

@@ -169,9 +169,9 @@ void PMCSG::setCSGType( const PMCSGType t )
    }
 }
 
-PMDialogEditBase* PMCSG::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMCSG::editWidget( TQWidget* parent ) const
 {
-   return new PMCSGEdit( tqparent );
+   return new PMCSGEdit( parent );
 }
 
 void PMCSG::restoreMemento( PMMemento* s )

kpovmodeler/pmcsg.h

@@ -74,7 +74,7 @@ public:
    /**
     * Returns a new @ref PMCSGEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /**
     * Returns the name of the pixmap that is displayed in the tree view
     * and dialog view

kpovmodeler/pmcsgedit.cpp

@@ -24,8 +24,8 @@
 #include <tqcombobox.h>
 #include <klocale.h>
 
-PMCSGEdit::PMCSGEdit( TQWidget* tqparent, const char* name )
+PMCSGEdit::PMCSGEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmcsgedit.h

@@ -39,9 +39,9 @@ class PMCSGEdit : public PMSolidObjectEdit
    typedef PMSolidObjectEdit Base;
 public:
    /**
-    * Creates a PMCSGEdit with tqparent and name
+    * Creates a PMCSGEdit with parent and name
     */
-   PMCSGEdit( TQWidget* tqparent, const char* name = 0 );
+   PMCSGEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmcylinder.cpp

@@ -160,9 +160,9 @@ void PMCylinder::setOpen( bool op )
    }
 }
 
-PMDialogEditBase* PMCylinder::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMCylinder::editWidget( TQWidget* parent ) const
 {
-   return new PMCylinderEdit( tqparent );
+   return new PMCylinderEdit( parent );
 }
 
 void PMCylinder::restoreMemento( PMMemento* s )

kpovmodeler/pmcylinder.h

@@ -67,7 +67,7 @@ public:
    /**
     * Returns a new @ref PMCylinderEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /**
     * Returns the name of the pixmap that is displayed in the tree view and dialog view
     */

kpovmodeler/pmcylinderedit.cpp

@@ -26,8 +26,8 @@
 #include <klocale.h>
 #include <tqcheckbox.h>
 
-PMCylinderEdit::PMCylinderEdit( TQWidget* tqparent, const char* name )
+PMCylinderEdit::PMCylinderEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmcylinderedit.h

@@ -38,9 +38,9 @@ class PMCylinderEdit : public PMSolidObjectEdit
    typedef PMSolidObjectEdit Base;
 public:
    /**
-    * Creates a PMCylinderEdit with tqparent and name
+    * Creates a PMCylinderEdit with parent and name
     */
-   PMCylinderEdit( TQWidget* tqparent, const char* name = 0 );
+   PMCylinderEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmdeclare.cpp

@@ -131,9 +131,9 @@ void PMDeclare::readAttributes( const PMXMLHelper& h )
    Base::readAttributes( h );
 }
 
-PMDialogEditBase* PMDeclare::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMDeclare::editWidget( TQWidget* parent ) const
 {
-   return new PMDeclareEdit( tqparent );
+   return new PMDeclareEdit( parent );
 }
 
 void PMDeclare::setID( const TQString& newID )

kpovmodeler/pmdeclare.h

@@ -69,7 +69,7 @@ public:
    /**
     * Returns a new @ref PMDeclareEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /**
     * Returns the id of the declare
     */

kpovmodeler/pmdeclareedit.cpp

@@ -33,8 +33,8 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 
-PMDeclareEdit::PMDeclareEdit( TQWidget* tqparent, const char* name )
+PMDeclareEdit::PMDeclareEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
    m_pSelectedObject = 0;

kpovmodeler/pmdeclareedit.h

@@ -42,9 +42,9 @@ class PMDeclareEdit : public PMDialogEditBase
    typedef PMDialogEditBase Base;
 public:
    /**
-    * Creates a PMDeclareEdit with tqparent and name
+    * Creates a PMDeclareEdit with parent and name
     */
-   PMDeclareEdit( TQWidget* tqparent, const char* name = 0 );
+   PMDeclareEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmdeletecommand.cpp

@@ -30,11 +30,11 @@ PMDeleteCommand::PMDeleteCommand( PMObject* obj )
       : PMCommand( i18n( "Delete %1" ).tqarg( obj->name( ) ) )
 {
    // the scene can not be deleted!
-   if( obj->tqparent( ) )
+   if( obj->parent( ) )
       m_infoList.append( new PMDeleteInfo( obj ) );
    else
    {
-      // object has no tqparent!
+      // object has no parent!
       // top level objects can't be moved, move all child items
       PMObject* tmp;
       for( tmp = obj->firstChild( ); tmp; tmp = tmp->nextSibling( ) )
@@ -55,11 +55,11 @@ PMDeleteCommand::PMDeleteCommand( const PMObjectList& list )
    {
       obj = it.current( );
       
-      if( obj->tqparent( ) )  
+      if( obj->parent( ) )  
          m_infoList.append( new PMDeleteInfo( obj ) );
       else
       {
-         // object has no tqparent!
+         // object has no parent!
          // top level objects can't be moved, move all child items
          PMObject* tmp;
          for( tmp = obj->firstChild( ); tmp; tmp = tmp->nextSibling( ) )
@@ -91,7 +91,7 @@ void PMDeleteCommand::execute( PMCommandManager* theManager )
    {
       PMDeleteInfoListIterator it( m_infoList );
       PMDeleteInfo* info = 0;
-      PMObject* tqparent;
+      PMObject* parent;
       
       if( !m_linksCreated )
       {
@@ -120,23 +120,23 @@ void PMDeleteCommand::execute( PMCommandManager* theManager )
       for( it.toLast( ); it.current( ); --it )
       {
          info = it.current( );
-         tqparent = info->tqparent( );
+         parent = info->parent( );
          // signal has to be emitted before the item is removed
          theManager->cmdObjectChanged( info->deletedObject( ), PMCRemove );
          if( m_firstExecution )
-            if( tqparent->dataChangeOnInsertRemove( )
+            if( parent->dataChangeOnInsertRemove( )
-                && !tqparent->mementoCreated( ) )
+                && !parent->mementoCreated( ) )
-               tqparent->createMemento( );
+               parent->createMemento( );
-         tqparent->takeChild( info->deletedObject( ) );
+         parent->takeChild( info->deletedObject( ) );
       }
 
       if( m_firstExecution )
       {
          for( it.toLast( ); it.current( ); --it )
          {
-            tqparent = it.current( )->tqparent( );
+            parent = it.current( )->parent( );
-            if( tqparent->mementoCreated( ) )
+            if( parent->mementoCreated( ) )
-               m_dataChanges.append( tqparent->takeMemento( ) );
+               m_dataChanges.append( parent->takeMemento( ) );
          }
       }
 
@@ -166,11 +166,11 @@ void PMDeleteCommand::undo( PMCommandManager* theManager )
       for( ; it.current( ); ++it )
       {
          if( it.current( )->prevSibling( ) )
-            it.current( )->tqparent( )
+            it.current( )->parent( )
                ->insertChildAfter( it.current( )->deletedObject( ),
                                    it.current( )->prevSibling( ) );
          else
-            it.current( )->tqparent( )
+            it.current( )->parent( )
                ->insertChild( it.current( )->deletedObject( ), 0 );
          theManager->cmdObjectChanged( it.current( )->deletedObject( ), PMCAdd );
       }
@@ -230,7 +230,7 @@ int PMDeleteCommand::errorFlags( PMPart* )
          {
             insideSelection = false;
             for( obj = links.current( ); obj && !insideSelection;
-                 obj = obj->tqparent( ) )
+                 obj = obj->parent( ) )
             {
                if( m_deletedObjects.find( obj ) )
                   insideSelection = true;
@@ -239,7 +239,7 @@ int PMDeleteCommand::errorFlags( PMPart* )
             if( insideSelection )
             {
                bool stop = false;
-               for( obj = links.current( ); obj && !stop; obj = obj->tqparent( ) )
+               for( obj = links.current( ); obj && !stop; obj = obj->parent( ) )
                {
                   if( m_deletedObjects.find( obj ) )
                      stop = true;

kpovmodeler/pmdeletecommand.h

@@ -39,12 +39,12 @@ class PMDeleteInfo
 public:
    /**
     * Creates undo information for the object deletedObject.
-    * The object has to have a tqparent!
+    * The object has to have a parent!
     */
    PMDeleteInfo( PMObject* deletedObject )
    {
       m_pDeletedObject = deletedObject;
-      m_pParent = deletedObject->tqparent( );
+      m_pParent = deletedObject->parent( );
       m_pPrevSibling = deletedObject->prevSibling( );
       m_insertError = false;
    }
@@ -57,9 +57,9 @@ public:
     */
    PMObject* deletedObject( ) const { return m_pDeletedObject; }
    /**
-    * Returns a pointer to the tqparent of the deleted object
+    * Returns a pointer to the parent of the deleted object
     */
-   PMObject* tqparent( ) const { return m_pParent; }
+   PMObject* parent( ) const { return m_pParent; }
    /**
     * Returns the previous sibling of the deleted object
     */

kpovmodeler/pmdensity.cpp

@@ -69,8 +69,8 @@ TQString PMDensity::description( ) const
 }
 
 
-PMDialogEditBase* PMDensity::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMDensity::editWidget( TQWidget* parent ) const
 {
-   return new PMDensityEdit( tqparent );
+   return new PMDensityEdit( parent );
 }
 

kpovmodeler/pmdensity.h

@@ -59,7 +59,7 @@ public:
    /**
     * Returns a new @ref PMDensityEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /** */
    virtual TQString pixmap( ) const { return TQString( "pmdensity" ); }
 

kpovmodeler/pmdensityedit.cpp

@@ -25,8 +25,8 @@
 #include <klocale.h>
 
 
-PMDensityEdit::PMDensityEdit( TQWidget* tqparent, const char* name )
+PMDensityEdit::PMDensityEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmdensityedit.h

@@ -38,9 +38,9 @@ class PMDensityEdit : public PMTextureBaseEdit
    typedef PMTextureBaseEdit Base;
 public:
    /**
-    * Creates a PMDensityEdit with tqparent and name
+    * Creates a PMDensityEdit with parent and name
     */
-   PMDensityEdit( TQWidget* tqparent, const char* name = 0 );
+   PMDensityEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmdetailobjectedit.cpp

@@ -23,8 +23,8 @@
 #include <tqcombobox.h>
 #include <klocale.h>
 
-PMDetailObjectEdit::PMDetailObjectEdit( TQWidget* tqparent, const char* name )
+PMDetailObjectEdit::PMDetailObjectEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmdetailobjectedit.h

@@ -39,9 +39,9 @@ class PMDetailObjectEdit : public PMNamedObjectEdit
    typedef PMNamedObjectEdit Base;
 public:
    /**
-    * Creates a PMNamedObjectEdit with tqparent and name
+    * Creates a PMNamedObjectEdit with parent and name
     */
-   PMDetailObjectEdit( TQWidget* tqparent, const char* name = 0 );
+   PMDetailObjectEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmdialogeditbase.cpp

@@ -95,8 +95,8 @@ const TQString c_boxCode = TQString(
 const TQString c_globalSettingsCode = TQString(
    "global_settings { assumed_gamma %1 }\n" );
 
-PMDialogEditBase::PMDialogEditBase( TQWidget* tqparent, const char* name )
+PMDialogEditBase::PMDialogEditBase( TQWidget* parent, const char* name )
-      : TQWidget( tqparent, name )
+      : TQWidget( parent, name )
 {
    m_pDisplayedObject = 0;
    m_pPart = 0;
@@ -318,7 +318,7 @@ void PMDialogEditBase::findTextures( PMObject*& global, PMObject*& local ) const
    global = 0;
    local = 0;
 
-   for( o = m_pDisplayedObject; o; o = o->tqparent( ) )
+   for( o = m_pDisplayedObject; o; o = o->parent( ) )
    {
       if( o->type( ) == "Material" || o->type( ) == "Interior" ||
           o->type( ) == "Texture" || o->type( ) == "Pigment" ||
@@ -427,7 +427,7 @@ void PMDialogEditBase::slotTexturePreview( )
          PMObject* otr = o;
 
          // find the scene
-         while( otr->tqparent( ) ) otr = otr->tqparent( );
+         while( otr->parent( ) ) otr = otr->parent( );
 
          for( otr = otr->firstChild( ); otr && ( numDeclares > 0 );
               otr = otr->nextSibling( ) )

kpovmodeler/pmdialogeditbase.h

@@ -63,7 +63,7 @@ public:
     * No widgets are created within the constructor! You have to call
     * @ref createWidgets after creating a new edit widget.
     */
-   PMDialogEditBase( TQWidget* tqparent, const char* name = 0 );
+   PMDialogEditBase( TQWidget* parent, const char* name = 0 );
    /**
     * Destructor
     */

kpovmodeler/pmdialogview.cpp

@@ -39,8 +39,8 @@
 #include <tqscrollview.h>
 #include <tqlabel.h>
 
-PMDialogEditContent::PMDialogEditContent( TQWidget* tqparent, const char* name )
+PMDialogEditContent::PMDialogEditContent( TQWidget* parent, const char* name )
-      : TQScrollView( tqparent, name )
+      : TQScrollView( parent, name )
 {
    m_pContents = 0;
    setVScrollBarMode( AlwaysOff );
@@ -111,8 +111,8 @@ void PMDialogEditContent::resizeEvent( TQResizeEvent* /* ev */ )
    calculateSize( );
 }
 
-PMDialogView::PMDialogView( PMPart* part, TQWidget* tqparent, const char* name )
+PMDialogView::PMDialogView( PMPart* part, TQWidget* parent, const char* name )
-      : PMViewBase( tqparent, name )
+      : PMViewBase( parent, name )
 {
    m_pDisplayedWidget = 0;
    m_unsavedData = false;

kpovmodeler/pmdialogview.h

@@ -45,7 +45,7 @@ class PMDialogEditContent : public TQScrollView
    Q_OBJECT
   TQ_OBJECT
 public:
-   PMDialogEditContent( TQWidget* tqparent, const char* name = 0 );
+   PMDialogEditContent( TQWidget* parent, const char* name = 0 );
    void setContents( TQWidget* wid );
    void calculateSize( );
 protected:
@@ -69,7 +69,7 @@ public:
    /**
     * Creates a new PMDialogView widget
     */
-   PMDialogView( PMPart* part, TQWidget* tqparent, const char* name = 0 );
+   PMDialogView( PMPart* part, TQWidget* parent, const char* name = 0 );
    /**
     * Deletes the widget
     */
@@ -156,9 +156,9 @@ public:
    virtual TQString viewType( ) const { return TQString( "dialogview" ); }
    virtual TQString description( ) const;
    virtual TQString iconName( ) const { return TQString( "pmdialogview" ); }
-   virtual PMViewBase* newInstance( TQWidget* tqparent, PMPart* part ) const
+   virtual PMViewBase* newInstance( TQWidget* parent, PMPart* part ) const
    {
-      return new PMDialogView( part, tqparent );
+      return new PMDialogView( part, parent );
    }
 };
 

kpovmodeler/pmdisc.cpp

@@ -176,9 +176,9 @@ void PMDisc::setHoleRadius( double hradius )
    }
 }
 
-PMDialogEditBase* PMDisc::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMDisc::editWidget( TQWidget* parent ) const
 {
-   return new PMDiscEdit( tqparent );
+   return new PMDiscEdit( parent );
 }
 
 void PMDisc::restoreMemento( PMMemento* s )

kpovmodeler/pmdisc.h

@@ -67,7 +67,7 @@ public:
    /**
     * Returns a new @ref PMDiscEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /**
     * Returns the name of the pixmap that is displayed in the tree view and dialog view
     */

kpovmodeler/pmdiscedit.cpp

@@ -27,8 +27,8 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 
-PMDiscEdit::PMDiscEdit( TQWidget* tqparent, const char* name )
+PMDiscEdit::PMDiscEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmdiscedit.h

@@ -37,9 +37,9 @@ class PMDiscEdit : public PMGraphicalObjectEdit
    typedef PMGraphicalObjectEdit Base;
 public:
    /**
-    * Creates a PMPlaneEdit with tqparent and name
+    * Creates a PMPlaneEdit with parent and name
     */
-   PMDiscEdit( TQWidget* tqparent, const char* name = 0 );
+   PMDiscEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmdockwidget.cpp

@@ -134,8 +134,8 @@ public:
  *
  * @author Max Judin.
 */
-PMDockMainWindow::PMDockMainWindow( TQWidget* tqparent, const char *name, WFlags f)
+PMDockMainWindow::PMDockMainWindow( TQWidget* parent, const char *name, WFlags f)
-:KMainWindow( tqparent, name, f )
+:KMainWindow( parent, name, f )
 {
   TQString new_name = TQString(name) + TQString("_DockManager");
   dockManager = new PMDockManager( this, new_name.latin1() );
@@ -256,7 +256,7 @@ void PMDockMainWindow::setMainDockWidget( PMDockWidget* mdw )
 void PMDockMainWindow::setView( TQWidget *view )
 {
   if ( view->isA("PMDockWidget") ){
-    if ( TQT_BASE_OBJECT(view->tqparent()) != TQT_BASE_OBJECT(this) ) ((PMDockWidget*)view)->applyToWidget( this );
+    if ( TQT_BASE_OBJECT(view->parent()) != TQT_BASE_OBJECT(this) ) ((PMDockWidget*)view)->applyToWidget( this );
   }
 
 #ifndef NO_KDE2
@@ -266,9 +266,9 @@ void PMDockMainWindow::setView( TQWidget *view )
 #endif
 }
 
-PMDockWidget* PMDockMainWindow::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent, const TQString& strCaption, const TQString& strTabPageLabel)
+PMDockWidget* PMDockMainWindow::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent, const TQString& strCaption, const TQString& strTabPageLabel)
 {
-  return new PMDockWidget( dockManager, name.latin1(), pixmap, tqparent, strCaption, strTabPageLabel );
+  return new PMDockWidget( dockManager, name.latin1(), pixmap, parent, strCaption, strTabPageLabel );
 }
 
 void PMDockMainWindow::makeDockVisible( PMDockWidget* dock )
@@ -319,15 +319,15 @@ void PMDockMainWindow::slotDockWidgetUndocked()
 }
 
 /*************************************************************************/
-PMDockWidgetAbstractHeaderDrag::PMDockWidgetAbstractHeaderDrag( PMDockWidgetAbstractHeader* tqparent, PMDockWidget* dock, const char* name )
+PMDockWidgetAbstractHeaderDrag::PMDockWidgetAbstractHeaderDrag( PMDockWidgetAbstractHeader* parent, PMDockWidget* dock, const char* name )
-:TQFrame( tqparent, name )
+:TQFrame( parent, name )
 {
   dw = dock;
   installEventFilter( dock->dockManager() );
 }
 /*************************************************************************/
-PMDockWidgetHeaderDrag::PMDockWidgetHeaderDrag( PMDockWidgetAbstractHeader* tqparent, PMDockWidget* dock, const char* name )
+PMDockWidgetHeaderDrag::PMDockWidgetHeaderDrag( PMDockWidgetAbstractHeader* parent, PMDockWidget* dock, const char* name )
-:PMDockWidgetAbstractHeaderDrag( tqparent, dock, name )
+:PMDockWidgetAbstractHeaderDrag( parent, dock, name )
 {
 }
 
@@ -342,28 +342,28 @@ void PMDockWidgetHeaderDrag::paintEvent( TQPaintEvent* )
   paint.end();
 }
 /*************************************************************************/
-PMDockWidgetAbstractHeader::PMDockWidgetAbstractHeader( PMDockWidget* tqparent, const char* name )
+PMDockWidgetAbstractHeader::PMDockWidgetAbstractHeader( PMDockWidget* parent, const char* name )
-:TQFrame( tqparent, name )
+:TQFrame( parent, name )
 {
 }
 /*************************************************************************/
-PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* tqparent, const char* name )
+PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* parent, const char* name )
-:PMDockWidgetAbstractHeader( tqparent, name )
+:PMDockWidgetAbstractHeader( parent, name )
 {
   tqlayout = new TQHBoxLayout( this );
   tqlayout->setResizeMode( TQLayout::Minimum );
 
-  drag = new PMDockWidgetHeaderDrag( this, tqparent );
+  drag = new PMDockWidgetHeaderDrag( this, parent );
 
   closeButton = new PMDockButton_Private( this, "DockCloseButton" );
   closeButton->setPixmap( const_cast< const char** >(close_xpm) );
   int buttonWidth = 9, buttonHeight = 9;
   closeButton->setFixedSize(buttonWidth,buttonHeight);
-  connect( closeButton, TQT_SIGNAL(clicked()), tqparent, TQT_SIGNAL(headerCloseButtonClicked()));
+  connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerCloseButtonClicked()));
   // MODIFICATION (zehender)
   // The shell will delete the widget
   // undock is unnecessary
-  // connect( closeButton, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(undock()));
+  // connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock()));
 
   stayButton = new PMDockButton_Private( this, "DockStayButton" );
   stayButton->setToggleButton( true );
@@ -375,8 +375,8 @@ PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* tqparent, const char* name
   dockbackButton = new PMDockButton_Private( this, "DockbackButton" );
   dockbackButton->setPixmap( const_cast< const char** >(dockback_xpm));
   dockbackButton->setFixedSize(buttonWidth,buttonHeight);
-  connect( dockbackButton, TQT_SIGNAL(clicked()), tqparent, TQT_SIGNAL(headerDockbackButtonClicked()));
+  connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerDockbackButtonClicked()));
-  connect( dockbackButton, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(dockBack()));
+  connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(dockBack()));
 
   // MODIFICATION (zehender)
   // Add a button to undock the widget and dock it as top level
@@ -384,7 +384,7 @@ PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* tqparent, const char* name
   toDesktopButton = new PMDockButton_Private( this, "ToDesktopButton" );
   toDesktopButton->setPixmap( const_cast< const char** >(todesktop_xpm));
   toDesktopButton->setFixedSize(buttonWidth,buttonHeight);
-  connect( toDesktopButton, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(toDesktop()));
+  connect( toDesktopButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(toDesktop()));
 
   tqlayout->addWidget( drag );
   tqlayout->addWidget( dockbackButton );
@@ -398,7 +398,7 @@ PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* tqparent, const char* name
 void PMDockWidgetHeader::setTopLevel( bool isTopLevel )
 {
   if ( isTopLevel ){
-    PMDockWidget* par = (PMDockWidget*)tqparent();
+    PMDockWidget* par = (PMDockWidget*)parent();
     if( par) {
       if( par->isDockBackPossible())
         dockbackButton->show();
@@ -459,18 +459,18 @@ void PMDockWidgetHeader::setDragEnabled(bool b)
 #ifndef NO_KDE2
 void PMDockWidgetHeader::saveConfig( KConfig* c )
 {
-  c->writeEntry( TQString("%1%2").tqarg(tqparent()->name()).tqarg(":stayButton"), stayButton->isOn() );
+  c->writeEntry( TQString("%1%2").tqarg(parent()->name()).tqarg(":stayButton"), stayButton->isOn() );
 }
 
 void PMDockWidgetHeader::loadConfig( KConfig* c )
 {
-  setDragEnabled( !c->readBoolEntry( TQString("%1%2").tqarg(tqparent()->name()).tqarg(":stayButton"), false ) );
+  setDragEnabled( !c->readBoolEntry( TQString("%1%2").tqarg(parent()->name()).tqarg(":stayButton"), false ) );
 }
 #endif
 
 /*************************************************************************/
-PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const TQPixmap &pixmap, TQWidget* tqparent, const TQString& strCaption, const TQString& strTabPageLabel, WFlags f)
+PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const TQPixmap &pixmap, TQWidget* parent, const TQString& strCaption, const TQString& strTabPageLabel, WFlags f)
-: TQWidget( tqparent, name, f )
+: TQWidget( parent, name, f )
   ,formerBrotherDockWidget(0L)
   ,currentDockPos(DockNone)
   ,formerDockPos(DockNone)
@@ -479,7 +479,7 @@ PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const
 {
   d = new PMDockWidgetPrivate();  // create private data
 
-  d->_parent = tqparent;
+  d->_parent = parent;
 
   tqlayout = new TQVBoxLayout( this );
   tqlayout->setResizeMode( TQLayout::Minimum );
@@ -510,7 +510,7 @@ PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const
   widget = 0L;
 
   TQObject::connect(this, TQT_SIGNAL(hasUndocked()), manager->main, TQT_SLOT(slotDockWidgetUndocked()) );
-  applyToWidget( tqparent, TQPoint(0,0) );
+  applyToWidget( parent, TQPoint(0,0) );
 }
 
 void PMDockWidget::slotSetCaption( const TQString& str )
@@ -558,8 +558,8 @@ void PMDockWidget::setEnableDocking( int pos )
 
 void PMDockWidget::updateHeader()
 {
-  if ( tqparent() ){
+  if ( parent() ){
-    if ( (TQT_BASE_OBJECT(tqparent()) == TQT_BASE_OBJECT(manager->main)) || isGroup || (eDocking == PMDockWidget::DockNone) ){
+    if ( (TQT_BASE_OBJECT(parent()) == TQT_BASE_OBJECT(manager->main)) || isGroup || (eDocking == PMDockWidget::DockNone) ){
       header->hide();
     } else {
       header->setTopLevel( false );
@@ -573,7 +573,7 @@ void PMDockWidget::updateHeader()
 
 void PMDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
 {
-  if ( TQT_BASE_OBJECT(tqparent()) != TQT_BASE_OBJECT(s) )
+  if ( TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(s) )
   {
     hide();
     reparent(s, 0, TQPoint(0,0), false);
@@ -608,11 +608,11 @@ void PMDockWidget::applyToWidget( TQWidget* s, const TQPoint& p )
 
 void PMDockWidget::show()
 {
-  if ( tqparent() || manager->main->isVisible() )
+  if ( parent() || manager->main->isVisible() )
-    if ( !tqparent() ){
+    if ( !parent() ){
      emit manager->setDockDefaultPos( this );
      emit setDockDefaultPos();
-     if ( tqparent() ){
+     if ( parent() ){
         makeDockVisible();
       } else {
         TQWidget::show();
@@ -632,9 +632,9 @@ void PMDockWidget::setDockWindowType (NET::WindowType windowType)
 
 #endif
 
-void PMDockWidget::setDockWindowTransient (TQWidget *tqparent, bool transientEnabled)
+void PMDockWidget::setDockWindowTransient (TQWidget *parent, bool transientEnabled)
 {
-  d->_parent = tqparent;
+  d->_parent = parent;
   d->transient = transientEnabled;
   applyToWidget( parentWidget(), TQPoint(0,0) );
 }
@@ -664,8 +664,8 @@ bool PMDockWidget::event( TQEvent* pevent )
       break;
     case TQEvent::CaptionChange:
       if ( parentWidget() ){
-        if ( tqparent()->inherits("PMDockSplitter") ){
+        if ( parent()->inherits("PMDockSplitter") ){
-          ((PMDockSplitter*)(tqparent()))->updateName();
+          ((PMDockSplitter*)(parent()))->updateName();
         }
         if ( parentDockTabGroup() ){
           setDockTabName( parentDockTabGroup() );
@@ -686,7 +686,7 @@ bool PMDockWidget::event( TQEvent* pevent )
   }
   #undef KeyPress
   bool processed = TQWidget::event( pevent );
-  if( pevent->type( ) == TQEvent::AccelOverride && !processed && !tqparent( ) ){
+  if( pevent->type( ) == TQEvent::AccelOverride && !processed && !parent( ) ){
 	  // MODIFICATION (zehender)
 	  // floating widget, post event to main window
 	  processed = tqApp->sendEvent( manager->dockMainWidget( ), pevent );
@@ -702,7 +702,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
   bool succes = true; // tested flag
 
   // do not dock into a floating widget
-  if( target && !target->tqparent( ) )
+  if( target && !target->parent( ) )
      target = 0;
 
   // check allowed this dock submit this operations
@@ -715,18 +715,18 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
     succes = false;
   }
 
-  if ( tqparent() && !tqparent()->inherits("PMDockSplitter") && !parentDockTabGroup() ){
+  if ( parent() && !parent()->inherits("PMDockSplitter") && !parentDockTabGroup() ){
     succes = false;
   }
 
   // if docking to a tab group, and position is not center
-  // dock to the tqparent of the tab group
+  // dock to the parent of the tab group
   if( target && ( dockPos != PMDockWidget::DockCenter )
       && ( dockPos != PMDockWidget::DockNone ) )
   {
      TQWidget* pdt = target->parentDockTabGroup( );
      if( pdt )
-        return manualDock( ( PMDockWidget* ) ( pdt->tqparent( ) ),
+        return manualDock( ( PMDockWidget* ) ( pdt->parent( ) ),
                            dockPos, spliPos, pos, check, tabIndex );
   }
 
@@ -771,7 +771,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
 
     currentDockPos = PMDockWidget::DockCenter;
     emit manager->change();
-    return (PMDockWidget*)parentTab->tqparent();
+    return (PMDockWidget*)parentTab->parent();
   }
 
   // MODIFICATION (Zehender):
@@ -930,7 +930,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP
 
 PMDockTabGroup* PMDockWidget::parentDockTabGroup() const
 {
-  if ( !tqparent() ) return 0L;
+  if ( !parent() ) return 0L;
   TQWidget* candidate = parentWidget()->parentWidget();
   if ( candidate && candidate->inherits("PMDockTabGroup") ) return (PMDockTabGroup*)candidate;
   return 0L;
@@ -980,8 +980,8 @@ void PMDockWidget::undock()
       lastTab->applyToWidget( 0L );
       lastTab->move( parentTab->mapToGlobal(parentTab->frameGeometry().topLeft()) );
 
-      // PMDockTabGroup always have a tqparent that is a PMDockWidget
+      // PMDockTabGroup always have a parent that is a PMDockWidget
-      PMDockWidget* parentOfTab = (PMDockWidget*)parentTab->tqparent();
+      PMDockWidget* parentOfTab = (PMDockWidget*)parentTab->parent();
       delete parentTab; // PMDockTabGroup
 
       TQWidget* parentOfDockWidget = parentOfTab->parentWidget();
@@ -994,13 +994,13 @@ void PMDockWidget::undock()
           split->deactivate();
           if ( split->getFirst() == parentOfTab ){
             split->activate( lastTab );
-            if ( ((PMDockWidget*)split->tqparent())->splitterOrientation ==Qt::Vertical )
+            if ( ((PMDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical )
               emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockLeft );
             else
               emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockTop );
           } else {
             split->activate( 0L, lastTab );
-            if ( ((PMDockWidget*)split->tqparent())->splitterOrientation ==Qt::Vertical )
+            if ( ((PMDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical )
               emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockRight );
             else
               emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockBottom );
@@ -1081,7 +1081,7 @@ void PMDockWidget::setWidget( TQWidget* mw )
 {
   if ( !mw ) return;
 
-  if ( TQT_BASE_OBJECT(mw->tqparent()) != TQT_BASE_OBJECT(this) ){
+  if ( TQT_BASE_OBJECT(mw->parent()) != TQT_BASE_OBJECT(this) ){
     mw->reparent(this, 0, TQPoint(0,0), false);
   }
 
@@ -1111,20 +1111,20 @@ void PMDockWidget::setDockTabName( PMDockTabGroup* tab )
   tab->parentWidget()->setCaption( listOfCaption );
 
   tab->parentWidget()->tqrepaint( false ); // PMDockWidget->tqrepaint
-  if ( tab->parentWidget()->tqparent() )
+  if ( tab->parentWidget()->parent() )
-    if ( tab->parentWidget()->tqparent()->inherits("PMDockSplitter") )
+    if ( tab->parentWidget()->parent()->inherits("PMDockSplitter") )
-      ((PMDockSplitter*)(tab->parentWidget()->tqparent()))->updateName();
+      ((PMDockSplitter*)(tab->parentWidget()->parent()))->updateName();
 }
 
 bool PMDockWidget::mayBeHide() const
 {
-  bool f = (TQT_BASE_OBJECT(tqparent()) != TQT_BASE_OBJECT(manager->main));
+  bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main));
   return ( !isGroup && !isTabGroup && f && isVisible() && ( eDocking != (int)PMDockWidget::DockNone ) );
 }
 
 bool PMDockWidget::mayBeShow() const
 {
-  bool f = (TQT_BASE_OBJECT(tqparent()) != TQT_BASE_OBJECT(manager->main));
+  bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main));
   return ( !isGroup && !isTabGroup && f && !isVisible() );
 }
 
@@ -1157,7 +1157,7 @@ void PMDockWidget::makeDockVisible()
       p->show();
     p = p->parentWidget();
   }
-  if( tqparent() == 0L) // is undocked
+  if( parent() == 0L) // is undocked
     dockBack();
   show();
 }
@@ -1199,7 +1199,7 @@ void PMDockWidget::dockBack()
   // else dockback to the dockmainwindow (default behaviour)
   manualDock( ((PMDockMainWindow*)manager->main)->getMainDockWidget(), formerDockPos, d->splitPosInPercent, TQPoint(0,0), false, d->index);
   formerBrotherDockWidget = 0L;
-  if (tqparent())
+  if (parent())
     makeDockVisible();
 }
 
@@ -1549,7 +1549,7 @@ void PMDockManager::findFloatingWidgets( TQPtrList<PMDockWidget>& l )
    TQObjectListIt it( *childDock );
    for( ; it.current( ); ++it )
       if( it.current( )->inherits( "PMDockWidget" ) &&
-          !it.current( )->tqparent( ) )
+          !it.current( )->parent( ) )
          l.append( ( PMDockWidget* ) it.current( ) );
 }
 
@@ -1588,7 +1588,7 @@ void PMDockManager::dragMove( PMDockWidget* dw, TQPoint pos )
   int w = r.width() / 3;
   int h = r.height() / 3;
 
-  PMDockMainWindow* mw = ( PMDockMainWindow* ) tqparent( );
+  PMDockMainWindow* mw = ( PMDockMainWindow* ) parent( );
   TQWidget* cw = mw->centralWidget( );
   TQPoint cwp = cw->mapToGlobal( TQPoint( 0, 0 ) );
   int cwh = cw->height( );
@@ -1660,7 +1660,7 @@ void PMDockManager::drop()
     drawDragRectangle();    // only the old rect will be deleted
     return;
   }
-  if ( !currentMoveWidget && !currentDragWidget->tqparent() ) {
+  if ( !currentMoveWidget && !currentDragWidget->parent() ) {
     currentDragWidget->move( TQCursor::pos() - d->dragOffset );
   }
   else {
@@ -1800,7 +1800,7 @@ void PMDockManager::writeConfig(TQDomElement &base)
     TQObjectListIt it(*childDock);
     PMDockWidget *obj1;
     while ( (obj1=(PMDockWidget*)it.current()) ) {
-        if ( TQT_BASE_OBJECT(obj1->tqparent()) == TQT_BASE_OBJECT(main) )
+        if ( TQT_BASE_OBJECT(obj1->parent()) == TQT_BASE_OBJECT(main) )
             mainWidgetStr = TQString::tqfromLatin1(obj1->name());
         nList.append(obj1->name());
         ++it;
@@ -1842,8 +1842,8 @@ void PMDockManager::writeConfig(TQDomElement &base)
         }
 
         groupEl.appendChild(createStringEntry(doc, "name", TQString::tqfromLatin1(obj->name())));
-        groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->tqparent()));
+        groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->parent()));
-        if ( !obj->tqparent() ) {
+        if ( !obj->parent() ) {
             groupEl.appendChild(createRectEntry(doc, "geometry", TQRect(main->frameGeometry().topLeft(), main->size())));
             groupEl.appendChild(createBoolEntry(doc, "visible", obj->isVisible()));
         }
@@ -1891,7 +1891,7 @@ void PMDockManager::readConfig(TQDomElement &base)
     PMDockWidget *obj1;
     while ( (obj1=(PMDockWidget*)it.current()) ) {
         if ( !obj1->isGroup && !obj1->isTabGroup ) {
-            if ( obj1->tqparent() )
+            if ( obj1->parent() )
                 obj1->undock();
             else
                 obj1->hide();
@@ -2020,7 +2020,7 @@ void PMDockManager::writeConfig( KConfig* c, TQString group )
     ++it;
     //debug("  +Add subdock %s", obj->name());
     nList.append( obj->name() );
-    if ( TQT_BASE_OBJECT(obj->tqparent()) == TQT_BASE_OBJECT(main) )
+    if ( TQT_BASE_OBJECT(obj->parent()) == TQT_BASE_OBJECT(main) )
       c->writeEntry( "Main:view", obj->name() );
   }
 
@@ -2037,12 +2037,12 @@ void PMDockManager::writeConfig( KConfig* c, TQString group )
       if ( findList.find( obj->firstName.latin1() ) != -1 && findList.find( obj->lastName.latin1() ) != -1 ){
 
         c->writeEntry( cname+":type", "GROUP");
-        if ( !obj->tqparent() ){
+        if ( !obj->parent() ){
-          c->writeEntry( cname+":tqparent", "___null___");
+          c->writeEntry( cname+":parent", "___null___");
           c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
           c->writeEntry( cname+":visible", obj->isVisible());
         } else {
-          c->writeEntry( cname+":tqparent", "yes");
+          c->writeEntry( cname+":parent", "yes");
         }
         c->writeEntry( cname+":first_name", obj->firstName );
         c->writeEntry( cname+":last_name", obj->lastName );
@@ -2068,12 +2068,12 @@ void PMDockManager::writeConfig( KConfig* c, TQString group )
 /*************************************************************************************************/
       if ( obj->isTabGroup){
         c->writeEntry( cname+":type", "TAB_GROUP");
-        if ( !obj->tqparent() ){
+        if ( !obj->parent() ){
-          c->writeEntry( cname+":tqparent", "___null___");
+          c->writeEntry( cname+":parent", "___null___");
           c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
           c->writeEntry( cname+":visible", obj->isVisible());
         } else {
-          c->writeEntry( cname+":tqparent", "yes");
+          c->writeEntry( cname+":parent", "yes");
         }
         TQStrList list;
         for ( int i = 0; i < ((PMDockTabGroup*)obj->widget)->count(); ++i )
@@ -2088,7 +2088,7 @@ void PMDockManager::writeConfig( KConfig* c, TQString group )
         nList.first();
       } else {
 /*************************************************************************************************/
-        if ( !obj->tqparent() ){
+        if ( !obj->parent() ){
           c->writeEntry( cname+":type", "NULL_DOCK");
           c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) );
           c->writeEntry( cname+":visible", obj->isVisible());
@@ -2149,7 +2149,7 @@ void PMDockManager::readConfig( KConfig* c, TQString group )
     ++it;
     if ( !obj->isGroup && !obj->isTabGroup )
     {
-      if ( obj->tqparent() ) obj->undock(); else obj->hide();
+      if ( obj->parent() ) obj->undock(); else obj->hide();
     }
   }
 
@@ -2199,7 +2199,7 @@ void PMDockManager::readConfig( KConfig* c, TQString group )
       obj = tabDockGroup;
     }
 
-    if ( type == "NULL_DOCK" || c->readEntry( oname + ":tqparent") == "___null___" ){
+    if ( type == "NULL_DOCK" || c->readEntry( oname + ":parent") == "___null___" ){
       TQRect r = c->readRectEntry( oname + ":tqgeometry" );
       obj = getDockWidgetFromName( oname );
       obj->applyToWidget( 0L );
@@ -2408,8 +2408,8 @@ void PMDockManager::drawDragRectangle()
 
 #ifdef _JOWENN_EXPERIMENTAL_
 
-PMDockArea::PMDockArea( TQWidget* tqparent, const char *name)
+PMDockArea::PMDockArea( TQWidget* parent, const char *name)
-:TQWidget( tqparent, name)
+:TQWidget( parent, name)
 {
   TQString new_name = TQString(name) + TQString("_DockManager");
   dockManager = new PMDockManager( this, new_name.latin1() );
@@ -2421,9 +2421,9 @@ PMDockArea::~PMDockArea()
 	delete dockManager;
 }
 
-PMDockWidget* PMDockArea::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent, const TQString& strCaption, const TQString& strTabPageLabel)
+PMDockWidget* PMDockArea::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent, const TQString& strCaption, const TQString& strTabPageLabel)
 {
-  return new PMDockWidget( dockManager, name.latin1(), pixmap, tqparent, strCaption, strTabPageLabel );
+  return new PMDockWidget( dockManager, name.latin1(), pixmap, parent, strCaption, strTabPageLabel );
 }
 
 void PMDockArea::makeDockVisible( PMDockWidget* dock )

kpovmodeler/pmdockwidget.h

@@ -115,10 +115,10 @@ public:
   /**
    * Constructs this.
    *
-   * @param tqparent the tqparent widget (usually a dockwidget)
+   * @param parent the parent widget (usually a dockwidget)
    * @param name   the object instance name
    */
-  PMDockWidgetAbstractHeader( PMDockWidget* tqparent, const char* name = 0L );
+  PMDockWidgetAbstractHeader( PMDockWidget* parent, const char* name = 0L );
 
   /**
    * Destructs this.
@@ -165,11 +165,11 @@ public:
   /**
    * Constructs this.
    *
-   * @param tqparent the tqparent widget (usually a dockwidget header)
+   * @param parent the parent widget (usually a dockwidget header)
    * @param dock   the dockwidget where it belongs to
    * @param name   the object instance name
    */
-  PMDockWidgetAbstractHeaderDrag( PMDockWidgetAbstractHeader* tqparent,
+  PMDockWidgetAbstractHeaderDrag( PMDockWidgetAbstractHeader* parent,
                                  PMDockWidget* dock, const char* name = 0L );
 
   /**
@@ -211,11 +211,11 @@ public:
   /**
    * Constructs this.
    *
-   * @param tqparent the tqparent widget (usually a dockwidget header)
+   * @param parent the parent widget (usually a dockwidget header)
    * @param dock   the dockwidget where it belongs to
    * @param name   the object instance name
    */
-  PMDockWidgetHeaderDrag( PMDockWidgetAbstractHeader* tqparent, PMDockWidget* dock,
+  PMDockWidgetHeaderDrag( PMDockWidgetAbstractHeader* parent, PMDockWidget* dock,
                          const char* name = 0L );
 
   /**
@@ -253,10 +253,10 @@ public:
   /**
    * Constructs this.
    *
-   * @param tqparent the tqparent widget (usually a dockwidget)
+   * @param parent the parent widget (usually a dockwidget)
    * @param name   the object instance name
    */
-  PMDockWidgetHeader( PMDockWidget* tqparent, const char* name = 0L );
+  PMDockWidgetHeader( PMDockWidget* parent, const char* name = 0L );
 
   /**
    * Destructs this.
@@ -358,8 +358,8 @@ public:
   /**
    * Constructs this. It just calls the method of the base class.
    */
-  PMDockTabGroup( TQWidget *tqparent = 0, const char *name = 0 )
+  PMDockTabGroup( TQWidget *parent = 0, const char *name = 0 )
-  :TQTabWidget( tqparent, name ){};
+  :TQTabWidget( parent, name ){};
 
   /**
    * Destructs a PMDockTabGroup.
@@ -378,7 +378,7 @@ private:
  * encapsulate the actual widgets (and member of the dockwidget class
  * set).
  *
- * You just grip the double-lined panel, tear it off its tqparent
+ * You just grip the double-lined panel, tear it off its parent
  * widget, drag it somewhere and let it loose. Depending on the
  * position where you leave it, the dockwidget becomes a toplevel
  * window on the desktop (floating mode) or docks to a new widget
@@ -397,7 +397,7 @@ private:
  * PMDockMainWindow* mainWidget;
  * ...
  * PMDockWidget* dock = 0L;
- * dock = mainWidget->createDockWidget( "Any window caption", nicePixmap, 0L, i18n("window caption")); // 0L==no tqparent
+ * dock = mainWidget->createDockWidget( "Any window caption", nicePixmap, 0L, i18n("window caption")); // 0L==no parent
  * TQWidget* actualWidget = new TQWidget( dock);
  * dock->setWidget( actualWidget); // embed it
  * dock->setToolTipString(i18n("That's me")); // available when appearing as tab page
@@ -429,12 +429,12 @@ public:
    * @param dockManager The responsible manager (dock helper)
    * @param name        Object instance name
    * @param pixmap      An icon (for instance shown when docked centered)
-   * @param tqparent      Parent widget
+   * @param parent      Parent widget
    * @param strCaption  Title of the dockwidget window (shown when toplevel)
    * @param strTabPageLabel The title of the tab page (shown when in tab page mode), if it is "", only the icon will be shown, if it is 0L, the label is set to strCaption
    */
   PMDockWidget( PMDockManager* dockManager, const char* name,
-               const TQPixmap &pixmap, TQWidget* tqparent = 0L, const TQString& strCaption = 0L,
+               const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = 0L,
                const TQString& strTabPageLabel = " ", WFlags f = 0);
 
   /**
@@ -468,8 +468,8 @@ public:
    *
    * If the target is null, it will become a toplevel dockwidget at position pos;
    * Note: Docking to another dockwidget means exactly:
-   * A new tqparent dockwidget will be created, that replaces the target dockwidget and contains another single helper widget (tab widget or panner)
+   * A new parent dockwidget will be created, that replaces the target dockwidget and contains another single helper widget (tab widget or panner)
-   * which contains both dockwidgets, this and the target dockwidget. So consider tqparent<->child relationships change completely during such actions.
+   * which contains both dockwidgets, this and the target dockwidget. So consider parent<->child relationships change completely during such actions.
    *
    * @param  target The dockwidget to dock to
    * @param  dockPos One of the DockPositions this is going to dock to
@@ -477,7 +477,7 @@ public:
    * @param  pos The dock position, mainly of interest for docking to the desktop (as toplevel dockwidget)
    * @param  check Only for internal use;
    * @param  tabIndex The position index of the tab widget (when in tab page mode), -1 (default) means append
-   * @return result The group dockwidget that replaces the target dockwidget and will be grandtqparent of target and @p this.
+   * @return result The group dockwidget that replaces the target dockwidget and will be grandparent of target and @p this.
    */
   PMDockWidget* manualDock( PMDockWidget* target, DockPosition dockPos, int spliPos = 50, TQPoint pos = TQPoint(0,0), bool check = false, int tabIndex = -1);
 
@@ -506,7 +506,7 @@ public:
   int dockSite() const
   {
      // no docking if a floating dock widget
-     if( !tqparent( ) )
+     if( !parent( ) )
         return 0;
      return sDocking;
   }
@@ -550,7 +550,7 @@ public:
    * There are reasons that it's impossible:
    * @li It is a (tab) group.
    * @li It is already invisible ;-)
-   * @li The tqparent of this is the @ref PMDockMainWindow.
+   * @li The parent of this is the @ref PMDockMainWindow.
    * @li It isn't able to dock to another widget.
    */
   bool mayBeHide() const;
@@ -560,7 +560,7 @@ public:
    * There are reasons that it's impossible:
    * @li It is a (tab) group.
    * @li It is already visible ;-)
-   * @li The tqparent of this is the @p PMDockMainWindow.
+   * @li The parent of this is the @p PMDockMainWindow.
    */
   bool mayBeShow() const;
 
@@ -612,7 +612,7 @@ public:
    */
   virtual void show();
   /**
-   * @return the tqparent widget of this if it inherits class PMDockTabGroup
+   * @return the parent widget of this if it inherits class PMDockTabGroup
    */
   PMDockTabGroup* parentDockTabGroup() const;
 
@@ -632,7 +632,7 @@ public:
    *
    * @param windowType is type of dock window
    */
-  void setDockWindowTransient (TQWidget *tqparent, bool transientEnabled);
+  void setDockWindowTransient (TQWidget *parent, bool transientEnabled);
 
   // MODIFICATION (lpassos)
   /**
@@ -675,7 +675,7 @@ protected:
   /**
    * Checks some conditions and shows or hides the dockwidget header (drag panel).
    * The header is hidden if:
-   * @li the tqparent widget is the PMDockMainWindow
+   * @li the parent widget is the PMDockMainWindow
    * @li this is a (tab) group dockwidget
    * @li it is not able to dock to another dockwidget
    */
@@ -754,7 +754,7 @@ private:
   void setDockTabName( PMDockTabGroup* g);
 
   /**
-   * Retqparent to s or set this to the PMDockMainWindow's view if s is that dockmainwindow.
+   * Reparent to s or set this to the PMDockMainWindow's view if s is that dockmainwindow.
    * If s is O, simply move the widget.
    *
    * @param s the target widget to reparent to
@@ -894,7 +894,7 @@ public:
 
   /**
    * Shows all encapsulated widgets of all controlled dockwidgets and shows all dockwidgets which are
-   * tqparent of a dockwidget tab group.
+   * parent of a dockwidget tab group.
    */
   void activate();
 
@@ -989,7 +989,7 @@ signals:
   void replaceDock( PMDockWidget* oldDock, PMDockWidget* newDock );
 
   /**
-   * Signals a dockwidget without tqparent (toplevel) is shown.
+   * Signals a dockwidget without parent (toplevel) is shown.
    */
   void setDockDefaultPos( PMDockWidget* );
 
@@ -1043,7 +1043,7 @@ private:
    * Finds the TQWidget recursively at the position given as parameter
    *
    * @param w a variable where the method puts the TQWidget at that position (instead of a return value)
-   * @param p the tqparent widget where the recursive search should start from
+   * @param p the parent widget where the recursive search should start from
    * @param pos global (desktop) position of the wanted dockwidget
    */
   void findChildDockWidget( TQWidget*& w, const TQWidget* p, const TQPoint& pos );
@@ -1053,7 +1053,7 @@ public:
   /**
    * Finds all dockwidgets which are child, grandchild and so on of p.
    *
-   * @param p the tqparent widget where the recursive search starts from
+   * @param p the parent widget where the recursive search starts from
    * @param l the widget list that contains the search result after the return of this method
    */
   void findChildDockWidget( const TQWidget* p, TQWidgetList& l);
@@ -1231,7 +1231,7 @@ public:
    *
    * @param name object name
    */
-  PMDockMainWindow( TQWidget* tqparent = 0L, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose );
+  PMDockMainWindow( TQWidget* parent = 0L, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose );
 
   /**
    * Destructs a dockmainwindow.
@@ -1266,12 +1266,12 @@ public:
    *
    * @param name   TQObject name (default dockwidget caption)
    * @param pixmap window icon (for instance shown when docked as tabwidget entry)
-   * @param tqparent tqparent widget for the new dockwidget
+   * @param parent parent widget for the new dockwidget
    * @param strCaption  window title (shown when toplevel)
    * @param strTabPageLabel title of the tab page (visible when in tab page mode), if it is "", only the icon will be shown; if it is 0L, the label is set to strCaption
    * @return    a pointer to the new created dockwidget
    */
-  PMDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent = 0L, const TQString& strCaption = 0L, const TQString& strTabPageLabel = " ");
+  PMDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = 0L, const TQString& strTabPageLabel = " ");
 
   /**
    * Saves the current dock window tqlayout into a DOM tree below the given element.
@@ -1427,7 +1427,7 @@ friend class PMDockManager;
 public:
 
 
-  PMDockArea( TQWidget* tqparent = 0L, const char *name = 0L);
+  PMDockArea( TQWidget* parent = 0L, const char *name = 0L);
 
   virtual ~PMDockArea();
 
@@ -1437,7 +1437,7 @@ public:
   void setMainDockWidget( PMDockWidget* );
   PMDockWidget* getMainDockWidget(){ return mainDockWidget; }
 
-  PMDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent = 0L, const TQString& strCaption = 0L, const TQString& strTabPageLabel = " ");
+  PMDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = 0L, const TQString& strTabPageLabel = " ");
 
   void writeDockConfig(TQDomElement &base);
   void readDockConfig(TQDomElement &base);

kpovmodeler/pmdockwidget_private.cpp

@@ -22,8 +22,8 @@
 #include <tqpainter.h>
 #include <tqcursor.h>
 
-PMDockSplitter::PMDockSplitter(TQWidget *tqparent, const char *name, Qt::Orientation orient, int pos, bool highResolution)
+PMDockSplitter::PMDockSplitter(TQWidget *parent, const char *name, Qt::Orientation orient, int pos, bool highResolution)
-: TQWidget(tqparent, name)
+: TQWidget(parent, name)
 {
   divider = 0L;
   child0 = 0L;
@@ -288,8 +288,8 @@ bool PMDockSplitter::highResolution() const
 
 
 /*************************************************************************/
-PMDockButton_Private::PMDockButton_Private( TQWidget *tqparent, const char * name )
+PMDockButton_Private::PMDockButton_Private( TQWidget *parent, const char * name )
-:TQPushButton( tqparent, name )
+:TQPushButton( parent, name )
 {
   moveMouse = false;
   setFocusPolicy( TQ_NoFocus );

kpovmodeler/pmdockwidget_private.h

@@ -44,7 +44,7 @@ class PMDockSplitter : public TQWidget
   Q_OBJECT
   TQ_OBJECT
 public:
-  PMDockSplitter(TQWidget *tqparent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50, bool highResolution=false);  
+  PMDockSplitter(TQWidget *parent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50, bool highResolution=false);  
   virtual ~PMDockSplitter(){};
 
   void activate(TQWidget *c0, TQWidget *c1 = 0L);
@@ -99,7 +99,7 @@ class PMDockButton_Private : public TQPushButton
   Q_OBJECT
   TQ_OBJECT
 public:
-  PMDockButton_Private( TQWidget *tqparent=0, const char *name=0 );
+  PMDockButton_Private( TQWidget *parent=0, const char *name=0 );
   ~PMDockButton_Private();
 
 protected:

kpovmodeler/pmdragwidget.cpp

@@ -17,8 +17,8 @@
 
 #include "pmdragwidget.h"
 
-PMDragWidget::PMDragWidget( TQWidget* tqparent, const char* name, WFlags f )
+PMDragWidget::PMDragWidget( TQWidget* parent, const char* name, WFlags f )
-      : TQWidget( tqparent, name, f )
+      : TQWidget( parent, name, f )
 {
    dragging = false;
 }

kpovmodeler/pmdragwidget.h

@@ -36,7 +36,7 @@ class PMDragWidget : public TQWidget
    Q_OBJECT
   TQ_OBJECT
 public:
-   PMDragWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0 );
+   PMDragWidget( TQWidget* parent = 0, const char* name = 0, WFlags f = 0 );
    
    virtual void startDrag( );
 

kpovmodeler/pmerrordialog.cpp

@@ -29,8 +29,8 @@
 TQSize PMErrorDialog::s_size = TQSize( 150, 200 );
 
 PMErrorDialog::PMErrorDialog( const PMMessageList& messages, int errorFlags,
-                              TQWidget* tqparent, const char* name )
+                              TQWidget* parent, const char* name )
-      : KDialogBase( tqparent, name, true, i18n( "Messages" ),
+      : KDialogBase( parent, name, true, i18n( "Messages" ),
                      Ok | Cancel, Cancel )
 {
    TQVBox* page = makeVBoxMainWidget( );
@@ -51,7 +51,7 @@ PMErrorDialog::PMErrorDialog( const PMMessageList& messages, int errorFlags,
    for( ; pit.current( ); ++pit )
    {
       PMObject* obj = pit.current( )->linkedObject( );
-      for( ; obj; obj = obj->tqparent( ) )
+      for( ; obj; obj = obj->parent( ) )
       {
          TQPtrList<PMMessage>* pList = m_messageDict.find( obj );
          if( !pList )
@@ -60,7 +60,7 @@ PMErrorDialog::PMErrorDialog( const PMMessageList& messages, int errorFlags,
             m_messageDict.insert( obj, pList );
          }
          pList->append( pit.current( ) );
-         if( !obj->tqparent( ) )
+         if( !obj->parent( ) )
          {
             if( obj->type( ) != "scene" )
             {

kpovmodeler/pmerrordialog.h

@@ -45,7 +45,7 @@ class PMErrorDialog : public KDialogBase
   TQ_OBJECT
 public:
    /**
-    * Creates a modal PMErrorDialog with tqparent and name.
+    * Creates a modal PMErrorDialog with parent and name.
     *
     * messages is the message list. If the list contains a message of type
     * FatalError, the 'Proceed" button will not be shown.
@@ -54,7 +54,7 @@ public:
     * should be continued.
     */
    PMErrorDialog( const PMMessageList& messages, int errorFlags,
-                  TQWidget* tqparent = 0, const char* name = 0 );
+                  TQWidget* parent = 0, const char* name = 0 );
 
    static void saveConfig( KConfig* cfg );
    static void restoreConfig( KConfig* cfg );

kpovmodeler/pmfactory.cpp

@@ -56,7 +56,7 @@ PMFactory::~PMFactory( )
 
 KParts::Part* PMFactory::createPartObject( TQWidget* parentWidget,
                                      const char* widgetName,
-                                     TQObject* tqparent, const char* name,
+                                     TQObject* parent, const char* name,
                                      const char* classname,
                                      const TQStringList& /*args*/ )
 {
@@ -66,7 +66,7 @@ KParts::Part* PMFactory::createPartObject( TQWidget* parentWidget,
           || ( strcmp( classname, "KParts::ReadOnlyPart" ) == 0 ) );
 
    KParts::ReadWritePart *part = new PMPart( parentWidget, widgetName,
-                                             tqparent, name, readwrite );
+                                             parent, name, readwrite );
 
    return part;
 }

kpovmodeler/pmfactory.h

@@ -35,7 +35,7 @@ public:
 
    virtual KParts::Part* createPartObject( TQWidget* parentWidget,
                                      const char* widgetName,
-                                     TQObject* tqparent, const char* name,
+                                     TQObject* parent, const char* name,
                                      const char* classname,
                                      const TQStringList& args );
    

kpovmodeler/pmfiledialog.cpp

@@ -22,13 +22,13 @@
 #include <kfilefiltercombo.h>
 
 
-PMFileDialog::PMFileDialog( const TQString& startDir, const TQString& filter, TQWidget* tqparent, const char* name, bool modal )
+PMFileDialog::PMFileDialog( const TQString& startDir, const TQString& filter, TQWidget* parent, const char* name, bool modal )
-      : KFileDialog( startDir, filter, tqparent, name, modal )
+      : KFileDialog( startDir, filter, parent, name, modal )
 {
 
 }
 
-TQString PMFileDialog::getImportFileName( TQWidget* tqparent, PMPart* part,
+TQString PMFileDialog::getImportFileName( TQWidget* parent, PMPart* part,
                                          PMIOFormat*& format )
 {
    PMIOManager* manager = part->ioManager( );
@@ -52,7 +52,7 @@ TQString PMFileDialog::getImportFileName( TQWidget* tqparent, PMPart* part,
       }
    }
 
-   PMFileDialog dlg( TQString(), filter, tqparent, "import file dialog", true );
+   PMFileDialog dlg( TQString(), filter, parent, "import file dialog", true );
    dlg.setOperationMode( Opening );
    dlg.setMode( KFile::File | KFile::LocalOnly );
    dlg.setCaption( i18n( "Import" ) );
@@ -64,7 +64,7 @@ TQString PMFileDialog::getImportFileName( TQWidget* tqparent, PMPart* part,
    return dlg.selectedFile( );
 }
 
-TQString PMFileDialog::getExportFileName( TQWidget* tqparent, PMPart* part,
+TQString PMFileDialog::getExportFileName( TQWidget* parent, PMPart* part,
                                          PMIOFormat*& format, TQString& selectedFilter )
 {
    PMIOManager* manager = part->ioManager( );
@@ -88,7 +88,7 @@ TQString PMFileDialog::getExportFileName( TQWidget* tqparent, PMPart* part,
       }
    }
 
-   PMFileDialog dlg( TQString(), filter, tqparent, "export file dialog", true );
+   PMFileDialog dlg( TQString(), filter, parent, "export file dialog", true );
    dlg.setOperationMode( Saving );
    dlg.setMode( KFile::File | KFile::LocalOnly );
    dlg.setCaption( i18n( "Export" ) );

kpovmodeler/pmfiledialog.h

@@ -44,17 +44,17 @@ public:
     * Default constructor, use the static methods
     * @ref getImportFileName or @ref getExportFileName instead
     */
-   PMFileDialog( const TQString& startDir, const TQString& filter, TQWidget* tqparent, const char* name, bool modal );
+   PMFileDialog( const TQString& startDir, const TQString& filter, TQWidget* parent, const char* name, bool modal );
    /**
     * Opens a modal file dialog and returns a selected file and the chosen
     * file format.
     */
-   static TQString getImportFileName( TQWidget* tqparent, PMPart* part, PMIOFormat*& format );
+   static TQString getImportFileName( TQWidget* parent, PMPart* part, PMIOFormat*& format );
    /**
     * Opens a modal file dialog and returns a selected file and the chosen
     * file format and filter.
     */
-   static TQString getExportFileName( TQWidget* tqparent, PMPart* part,
+   static TQString getExportFileName( TQWidget* parent, PMPart* part,
                                      PMIOFormat*& format, TQString& filter );
 };
 

kpovmodeler/pmfinish.cpp

@@ -637,9 +637,9 @@ void PMFinish::setIridTurbulence( double c )
    }
 }
 
-PMDialogEditBase* PMFinish::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMFinish::editWidget( TQWidget* parent ) const
 {
-   return new PMFinishEdit( tqparent );
+   return new PMFinishEdit( parent );
 }
 
 void PMFinish::restoreMemento( PMMemento* s )

kpovmodeler/pmfinish.h

@@ -65,7 +65,7 @@ public:
    /**
     * Returns a new @ref PMFinishEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /** */
    virtual TQString pixmap( ) const { return TQString( "pmfinish" ); }
 

kpovmodeler/pmfinishedit.cpp

@@ -29,8 +29,8 @@
 #include <kdialog.h>
 
 
-PMFinishEdit::PMFinishEdit( TQWidget* tqparent, const char* name )
+PMFinishEdit::PMFinishEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmfinishedit.h

@@ -43,9 +43,9 @@ class PMFinishEdit : public PMTextureBaseEdit
    typedef PMTextureBaseEdit Base;
 public:
    /**
-    * Creates a PMFinishEdit with tqparent and name
+    * Creates a PMFinishEdit with parent and name
     */
-   PMFinishEdit( TQWidget* tqparent, const char* name = 0 );
+   PMFinishEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmfog.cpp

@@ -284,9 +284,9 @@ void PMFog::setUp( const PMVector& c )
    }
 }
 
-PMDialogEditBase* PMFog::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMFog::editWidget( TQWidget* parent ) const
 {
-   return new PMFogEdit( tqparent );
+   return new PMFogEdit( parent );
 }
 
 void PMFog::restoreMemento( PMMemento* s )

kpovmodeler/pmfog.h

@@ -66,7 +66,7 @@ public:
    /**
     * Returns a new @ref PMFogEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /** */
    virtual TQString pixmap( ) const { return TQString( "pmfog" ); }
 

kpovmodeler/pmfogedit.cpp

@@ -30,8 +30,8 @@
 #include <kmessagebox.h>
 #include <kdialog.h>
 
-PMFogEdit::PMFogEdit( TQWidget* tqparent, const char* name )
+PMFogEdit::PMFogEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmfogedit.h

@@ -46,9 +46,9 @@ class PMFogEdit : public PMTextureBaseEdit
    typedef PMTextureBaseEdit Base;
 public:
    /**
-    * Creates a PMFogEdit with tqparent and name
+    * Creates a PMFogEdit with parent and name
     */
-   PMFogEdit( TQWidget* tqparent, const char* name = 0 );
+   PMFogEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmformulalabel.cpp

@@ -46,8 +46,8 @@ TQString PMFormulaLabel::s_digit[10] =
 
 TQString PMFormulaLabel::s_nullString = TQString( "= 0" );
 
-PMFormulaLabel::PMFormulaLabel( const PMPolynomExponents& exp, TQWidget* tqparent, const char* name )
+PMFormulaLabel::PMFormulaLabel( const PMPolynomExponents& exp, TQWidget* parent, const char* name )
-      : TQWidget( tqparent, name )
+      : TQWidget( parent, name )
 {
    m_exponents[0] = exp.exponent( 0 );
    m_exponents[1] = exp.exponent( 1 );
@@ -56,8 +56,8 @@ PMFormulaLabel::PMFormulaLabel( const PMPolynomExponents& exp, TQWidget* tqparen
    calculateSizeHint( );
 }
 
-PMFormulaLabel::PMFormulaLabel( int x, int y, int z, TQWidget* tqparent, const char* name )
+PMFormulaLabel::PMFormulaLabel( int x, int y, int z, TQWidget* parent, const char* name )
-      : TQWidget( tqparent, name )
+      : TQWidget( parent, name )
 {
    m_exponents[0] = x;
    m_exponents[1] = y;

kpovmodeler/pmformulalabel.h

@@ -37,11 +37,11 @@ public:
    /**
     * Displays the exponents of the @ref PMPolynomExponents
     */
-   PMFormulaLabel( const PMPolynomExponents& exp, TQWidget* tqparent, const char* name = 0 );
+   PMFormulaLabel( const PMPolynomExponents& exp, TQWidget* parent, const char* name = 0 );
    /**
     * Displays the given exponents
     */
-   PMFormulaLabel( int x, int y, int z, TQWidget* tqparent, const char* name = 0 );
+   PMFormulaLabel( int x, int y, int z, TQWidget* parent, const char* name = 0 );
    /**
     * Destructor
     */

kpovmodeler/pmglobalphotons.cpp

@@ -437,9 +437,9 @@ void PMGlobalPhotons::setRadiusMediaMulti( double rmm )
    }
 }
 
-PMDialogEditBase* PMGlobalPhotons::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMGlobalPhotons::editWidget( TQWidget* parent ) const
 {
-   return new PMGlobalPhotonsEdit( tqparent );
+   return new PMGlobalPhotonsEdit( parent );
 }
 
 void PMGlobalPhotons::restoreMemento( PMMemento* s )

kpovmodeler/pmglobalphotons.h

@@ -67,7 +67,7 @@ public:
    /**
     * Returns a new @ref PMGlobalPhotonsEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /**
     * Returns the name of the pixmap that is displayed in the tree view
     * and dialog view

kpovmodeler/pmglobalphotonsedit.cpp

@@ -29,8 +29,8 @@
 #include <kmessagebox.h>
 
 
-PMGlobalPhotonsEdit::PMGlobalPhotonsEdit( TQWidget* tqparent, const char* name )
+PMGlobalPhotonsEdit::PMGlobalPhotonsEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmglobalphotonsedit.h

@@ -42,9 +42,9 @@ class PMGlobalPhotonsEdit : public PMDialogEditBase
    typedef PMDialogEditBase Base;
 public:
    /**
-    * Creates a PMGlobalPhotonsEdit with tqparent and name
+    * Creates a PMGlobalPhotonsEdit with parent and name
     */
-   PMGlobalPhotonsEdit( TQWidget* tqparent, const char* name = 0 );
+   PMGlobalPhotonsEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmglobalsettings.cpp

@@ -432,9 +432,9 @@ void PMGlobalSettings::setRecursionLimit( int c )
    }
 }
 
-PMDialogEditBase* PMGlobalSettings::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMGlobalSettings::editWidget( TQWidget* parent ) const
 {
-   return new PMGlobalSettingsEdit( tqparent );
+   return new PMGlobalSettingsEdit( parent );
 }
 
 void PMGlobalSettings::restoreMemento( PMMemento* s )

kpovmodeler/pmglobalsettings.h

@@ -68,7 +68,7 @@ public:
    /**
     * Returns a new @ref PMGlobalSettingsEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /**
     * Returns the name of the pixmap that is displayed in the tree view
     * and dialog view

kpovmodeler/pmglobalsettingsedit.cpp

@@ -29,8 +29,8 @@
 #include <kdialog.h>
 #include <kmessagebox.h>
 
-PMGlobalSettingsEdit::PMGlobalSettingsEdit( TQWidget* tqparent, const char* name )
+PMGlobalSettingsEdit::PMGlobalSettingsEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmglobalsettingsedit.h

@@ -43,9 +43,9 @@ class PMGlobalSettingsEdit : public PMDialogEditBase
    typedef PMDialogEditBase Base;
 public:
    /**
-    * Creates a PMGlobalSettingsEdit with tqparent and name
+    * Creates a PMGlobalSettingsEdit with parent and name
     */
-   PMGlobalSettingsEdit( TQWidget* tqparent, const char* name = 0 );
+   PMGlobalSettingsEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmglview.cpp

@@ -106,8 +106,8 @@ bool PMGLView::s_bDirect = true;
 
 
 PMGLView::PMGLView( PMPart* part, PMViewType t,
-                    TQWidget* tqparent, const char* name, WFlags f )
+                    TQWidget* parent, const char* name, WFlags f )
-      : PMViewBase( tqparent, name, f | TQt::WWinOwnDC | TQt::WRepaintNoErase )
+      : PMViewBase( parent, name, f | TQt::WWinOwnDC | TQt::WRepaintNoErase )
 {
    m_pPart = part;
    m_type = t;
@@ -1178,9 +1178,9 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode,
             if( m_pCamera == ( PMCamera* ) obj )
                invalidateProjection( );
 
-         if( obj->tqparent( ) )
+         if( obj->parent( ) )
-            if( obj->tqparent( )->type( ) == "Camera" )
+            if( obj->parent( )->type( ) == "Camera" )
-               if( m_pCamera == ( PMCamera* ) obj->tqparent( ) )
+               if( m_pCamera == ( PMCamera* ) obj->parent( ) )
                   if( obj->hasTransformationMatrix( ) )
                      invalidateProjection( );
       }
@@ -1209,9 +1209,9 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode,
          if( obj->type( ) == "Camera" )
             if( !m_pCamera )
                setCamera( ( PMCamera* ) obj );
-         if( obj->tqparent( ) )
+         if( obj->parent( ) )
-            if( obj->tqparent( )->type( ) == "Camera" )
+            if( obj->parent( )->type( ) == "Camera" )
-               if( m_pCamera == ( PMCamera* ) obj->tqparent( ) )
+               if( m_pCamera == ( PMCamera* ) obj->parent( ) )
                   if( obj->hasTransformationMatrix( ) )
                      invalidateProjection( );
       }
@@ -1225,9 +1225,9 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode,
             setCamera( 0 );
 
       if( m_type == PMGLView::PMViewCamera )
-         if( obj->tqparent( ) )
+         if( obj->parent( ) )
-            if( obj->tqparent( )->type( ) == "Camera" )
+            if( obj->parent( )->type( ) == "Camera" )
-               if( m_pCamera == ( PMCamera* ) obj->tqparent( ) )
+               if( m_pCamera == ( PMCamera* ) obj->parent( ) )
                   if( obj->hasTransformationMatrix( ) )
                      invalidateProjection( );
 
@@ -1296,7 +1296,7 @@ PMObject* PMGLView::topLevelRenderingObject( PMObject* o ) const
          else if( obj->isA( "Scene" ) || obj->isA( "Declare" ) )
             stop = true;
          else
-            obj = obj->tqparent( );
+            obj = obj->parent( );
       }
       while( !stop );
    }
@@ -1760,10 +1760,10 @@ TQString PMGLViewFactory::description( PMViewOptions* vo ) const
    return description( );
 }
 
-PMViewOptionsWidget* PMGLViewFactory::newOptionsWidget( TQWidget* tqparent,
+PMViewOptionsWidget* PMGLViewFactory::newOptionsWidget( TQWidget* parent,
                                                         PMViewOptions* o )
 {
-   return new PMGLViewOptionsWidget( tqparent, o );
+   return new PMGLViewOptionsWidget( parent, o );
 }
 
 PMViewOptions* PMGLViewFactory::newOptionsInstance( ) const
@@ -1772,9 +1772,9 @@ PMViewOptions* PMGLViewFactory::newOptionsInstance( ) const
    return o;
 }
 
-PMGLViewOptionsWidget::PMGLViewOptionsWidget( TQWidget* tqparent,
+PMGLViewOptionsWidget::PMGLViewOptionsWidget( TQWidget* parent,
                                               PMViewOptions* o )
-      : PMViewOptionsWidget( tqparent )
+      : PMViewOptionsWidget( parent )
 {
    m_pOptions = ( PMGLViewOptions* ) o;
 

kpovmodeler/pmglview.h

@@ -62,7 +62,7 @@ public:
     * Constructor
     */
    PMGLView( PMPart* part, PMViewType t,
-             TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0 );
+             TQWidget* parent = 0, const char* name = 0, WFlags f = 0 );
    /**
     * Destructor
     */
@@ -559,9 +559,9 @@ public:
    virtual TQString description( ) const;
    virtual TQString description( PMViewOptions* ) const;
    virtual TQString iconName( ) const { return TQString( "pmglview" ); }
-   virtual PMViewBase* newInstance( TQWidget* tqparent, PMPart* part ) const
+   virtual PMViewBase* newInstance( TQWidget* parent, PMPart* part ) const
    {
-      return new PMGLView( part, PMGLView::PMViewPosX, tqparent );
+      return new PMGLView( part, PMGLView::PMViewPosX, parent );
    }
    virtual PMViewOptions* newOptionsInstance( ) const;
    virtual PMViewOptionsWidget* newOptionsWidget( TQWidget*, PMViewOptions* );
@@ -578,7 +578,7 @@ public:
    /**
     * Default constructor
     */
-   PMGLViewOptionsWidget( TQWidget* tqparent, PMViewOptions* o );
+   PMGLViewOptionsWidget( TQWidget* parent, PMViewOptions* o );
 
 protected slots:
    void slotGLViewTypeChanged( int );

kpovmodeler/pmgraphicalobject.h

@@ -101,7 +101,7 @@ public:
     */
    void setVisibilityLevel( int level );
    /**
-    * Returns true if the visibility level is relative to the objects tqparent
+    * Returns true if the visibility level is relative to the objects parent
     */
    bool isVisibilityLevelRelative( ) const { return m_relativeVisibility; }
    /**

kpovmodeler/pmgraphicalobjectedit.cpp

@@ -28,8 +28,8 @@
 const int c_minValue = -1000;
 const int c_maxValue = 1000;
 
-PMGraphicalObjectEdit::PMGraphicalObjectEdit( TQWidget* tqparent, const char* name )
+PMGraphicalObjectEdit::PMGraphicalObjectEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }
@@ -143,7 +143,7 @@ void PMGraphicalObjectEdit::slotLevelChanged( int )
 
 void PMGraphicalObjectEdit::recalculateResultingVisibility( )
 {
-   PMObject* o = m_pDisplayedObject->tqparent( );
+   PMObject* o = m_pDisplayedObject->parent( );
    PMGraphicalObject* go = 0;
    int level = 0;
    bool absoluteFound = false;
@@ -152,7 +152,7 @@ void PMGraphicalObjectEdit::recalculateResultingVisibility( )
    if( !m_pRelativeVisibility->isChecked( ) )
       absoluteFound = true;
 
-   for( ; o && !absoluteFound; o = o->tqparent( ) )
+   for( ; o && !absoluteFound; o = o->parent( ) )
    {
       if( o->isA( "GraphicalObject" ) )
       {

kpovmodeler/pmgraphicalobjectedit.h

@@ -41,9 +41,9 @@ class PMGraphicalObjectEdit : public PMDetailObjectEdit
    typedef PMDetailObjectEdit Base;
 public:
    /**
-    * Creates a PMGraphicalObjectEdit with tqparent and name
+    * Creates a PMGraphicalObjectEdit with parent and name
     */
-   PMGraphicalObjectEdit( TQWidget* tqparent, const char* name = 0 );
+   PMGraphicalObjectEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmgridsettings.cpp

@@ -28,8 +28,8 @@
 #include <kcolorbutton.h>
 #include <klocale.h>
 
-PMGridSettings::PMGridSettings( TQWidget* tqparent, const char* name )
+PMGridSettings::PMGridSettings( TQWidget* parent, const char* name )
-      : PMSettingsDialogPage( tqparent, name )
+      : PMSettingsDialogPage( parent, name )
 {
    TQHBoxLayout* htqlayout;
    TQVBoxLayout* vtqlayout;

kpovmodeler/pmgridsettings.h

@@ -39,7 +39,7 @@ public:
    /**
     * Default constructor
     */
-   PMGridSettings( TQWidget* tqparent, const char* name = 0 );
+   PMGridSettings( TQWidget* parent, const char* name = 0 );
    /** */
    virtual void displaySettings( );
    /** */

kpovmodeler/pmheightfield.cpp

@@ -200,9 +200,9 @@ void PMHeightField::setWaterLevel( double wl )
    }
 }
 
-PMDialogEditBase* PMHeightField::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMHeightField::editWidget( TQWidget* parent ) const
 {
-   return new PMHeightFieldEdit( tqparent );
+   return new PMHeightFieldEdit( parent );
 }
 
 void PMHeightField::restoreMemento( PMMemento* s )

kpovmodeler/pmheightfield.h

@@ -69,7 +69,7 @@ public:
    /**
     * Returns a new @ref PMHeightFieldEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /**
     * Returns the name of the pixmap that is displayed in the tree view
     * and dialog view

kpovmodeler/pmheightfieldedit.cpp

@@ -31,8 +31,8 @@
 #include <kiconloader.h>
 #include <kfiledialog.h>
 
-PMHeightFieldEdit::PMHeightFieldEdit( TQWidget* tqparent, const char* name )
+PMHeightFieldEdit::PMHeightFieldEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmheightfieldedit.h

@@ -43,9 +43,9 @@ class PMHeightFieldEdit : public PMSolidObjectEdit
    typedef PMSolidObjectEdit Base;
 public:
    /**
-    * Creates a PMHeightFieldEdit with tqparent and name
+    * Creates a PMHeightFieldEdit with parent and name
     */
-   PMHeightFieldEdit( TQWidget* tqparent, const char* name = 0 );
+   PMHeightFieldEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmimagemap.cpp

@@ -459,9 +459,9 @@ void PMImageMap::setTransmits( const TQValueList<PMPaletteValue>& c )
    }
 }
 
-PMDialogEditBase* PMImageMap::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMImageMap::editWidget( TQWidget* parent ) const
 {
-   return new PMImageMapEdit( tqparent );
+   return new PMImageMapEdit( parent );
 }
 
 void PMImageMap::restoreMemento( PMMemento* s )

kpovmodeler/pmimagemap.h

@@ -86,7 +86,7 @@ public:
    /**
     * Returns a new @ref PMImageMapEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
 
    /**
     * Gets the bitmap type

kpovmodeler/pmimagemapedit.cpp

@@ -38,8 +38,8 @@
 #include <kfiledialog.h>
 #include <kiconloader.h>
 
-PMImageMapEdit::PMImageMapEdit( TQWidget* tqparent, const char* name )
+PMImageMapEdit::PMImageMapEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmimagemapedit.h

@@ -49,9 +49,9 @@ class PMImageMapEdit : public PMDialogEditBase
    typedef PMDialogEditBase Base;
 public:
    /**
-    * Creates a PMImageMapEdit with tqparent and name
+    * Creates a PMImageMapEdit with parent and name
     */
-   PMImageMapEdit( TQWidget* tqparent, const char* name = 0 );
+   PMImageMapEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pminserterrordialog.cpp

@@ -25,8 +25,8 @@
 PMInsertErrorDialog::PMInsertErrorDialog(
    int numObj, int numErrors,
    const TQStringList& details,
-   TQWidget* tqparent /*= 0*/, const char* name /*= 0*/ )
+   TQWidget* parent /*= 0*/, const char* name /*= 0*/ )
-      : KDialogBase( tqparent, name, true, i18n( "Insert Errors" ),
+      : KDialogBase( parent, name, true, i18n( "Insert Errors" ),
                      Help | Ok | User1, Ok, false, i18n( "Details" ) )
 {
    TQVBox* page = makeVBoxMainWidget( );

kpovmodeler/pminserterrordialog.h

@@ -39,11 +39,11 @@ class PMInsertErrorDialog : public KDialogBase
   TQ_OBJECT
 public:
    /**
-    * Creates a modal PMInsertErrorDialog with tqparent and name.
+    * Creates a modal PMInsertErrorDialog with parent and name.
     */
    PMInsertErrorDialog( int NumberOfObjects, int NumberOfInsertErrors,
                        const TQStringList& details,
-                       TQWidget* tqparent = 0, const char* name = 0 );
+                       TQWidget* parent = 0, const char* name = 0 );
 protected slots:
    void slotUser1( );
  

kpovmodeler/pminsertpopup.cpp

@@ -21,11 +21,11 @@
 #include <kiconloader.h>
 #include <tqcursor.h>
 
-PMInsertPopup::PMInsertPopup( TQWidget* tqparent, bool multipleObjects,
+PMInsertPopup::PMInsertPopup( TQWidget* parent, bool multipleObjects,
                               int items, bool canInsertAllAsFirstChildren,
                               bool canInsertAllAsLastChildren,
                               bool canInsertAllAsSiblings, const char* name )
-      : KPopupMenu( tqparent, name )
+      : KPopupMenu( parent, name )
 {
    TQString itemText;
    if( multipleObjects )
@@ -71,13 +71,13 @@ PMInsertPopup::PMInsertPopup( TQWidget* tqparent, bool multipleObjects,
    }
 }
 
-int PMInsertPopup::choosePlace( TQWidget* tqparent, bool multipleObjects,
+int PMInsertPopup::choosePlace( TQWidget* parent, bool multipleObjects,
                                 int items, bool canInsertAllAsFirstChildren,
                                 bool canInsertAllAsLastChildren,
                                 bool canInsertAllAsSiblings )
 {
    int result;
-   PMInsertPopup* popup = new PMInsertPopup( tqparent, multipleObjects, items,
+   PMInsertPopup* popup = new PMInsertPopup( parent, multipleObjects, items,
                                              canInsertAllAsFirstChildren,
                                              canInsertAllAsLastChildren,
                                              canInsertAllAsSiblings );

kpovmodeler/pminsertpopup.h

@@ -39,13 +39,13 @@ public:
    /**
     * Creates a popup menu
     *
-    * @param tqparent The tqparent widget
+    * @param parent The parent widget
     * @param multipleObjects True if more than one object will be inserted
     * @param items Which items to display. Can be a bitwise combination
     *              of PMIFirstChild, PMILastChild, PMISibling.
     * @param name Internal name of the popup menu
     */
-   PMInsertPopup( TQWidget* tqparent, bool multipleObjects,
+   PMInsertPopup( TQWidget* parent, bool multipleObjects,
                   int items = PMIFirstChild | PMILastChild | PMISibling,
                   bool canInsertAllAsFirstChildren = true,
                   bool canInsertAllAsLastChildren = true,
@@ -59,7 +59,7 @@ public:
    /**
     * Popups a PMInsertPopup menu
     *
-    * @param tqparent The tqparent widget
+    * @param parent The parent widget
     * @param multipleObjects True if more than one object will be inserted
     * @param items Which items to display. Can be a bitwise combination
     *              of PMIFirstChild, PMILastChild, PMISibling.
@@ -70,7 +70,7 @@ public:
     *
     * Returns the selected item or 0 if no item was selected.
     */
-   static int choosePlace( TQWidget* tqparent, bool multipleObjects,
+   static int choosePlace( TQWidget* parent, bool multipleObjects,
                            int items = PMIFirstChild | PMILastChild
                            | PMISibling, 
                            bool canInsertAllAsFirstChildren = true,

kpovmodeler/pminsertrulesystem.cpp

@@ -767,12 +767,12 @@ bool PMRule::matches( const TQString& className )
    return m;
 }
 
-bool PMRule::evaluate( const PMObject* tqparent )
+bool PMRule::evaluate( const PMObject* parent )
 {
    if( !m_pCondition )
       return true;
    else
-      return m_pCondition->evaluate( tqparent );
+      return m_pCondition->evaluate( parent );
 }
 
 PMRuleTargetClass::PMRuleTargetClass( TQDomElement& e,

kpovmodeler/pminsertrulesystem.h

@@ -535,7 +535,7 @@ public:
    /**
     * Returns the conditions value.
     */
-   bool evaluate( const PMObject* tqparent );
+   bool evaluate( const PMObject* parent );
 
 private:
    TQPtrList<PMRuleCategory> m_categories;

kpovmodeler/pminterior.cpp

@@ -281,9 +281,9 @@ void PMInterior::enableFadePower( bool c )
    }
 }
 
-PMDialogEditBase* PMInterior::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMInterior::editWidget( TQWidget* parent ) const
 {
-   return new PMInteriorEdit( tqparent );
+   return new PMInteriorEdit( parent );
 }
 
 void PMInterior::restoreMemento( PMMemento* s )

kpovmodeler/pminterior.h

@@ -65,7 +65,7 @@ public:
    /**
     * Returns a new @ref PMInteriorEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /** */
    virtual TQString pixmap( ) const { return TQString( "pminterior" ); }
 

kpovmodeler/pminterioredit.cpp

@@ -27,8 +27,8 @@
 #include <klocale.h>
 
 
-PMInteriorEdit::PMInteriorEdit( TQWidget* tqparent, const char* name )
+PMInteriorEdit::PMInteriorEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pminterioredit.h

@@ -43,9 +43,9 @@ class PMInteriorEdit : public PMTextureBaseEdit
    typedef PMTextureBaseEdit Base;
 public:
    /**
-    * Creates a PMInteriorEdit with tqparent and name
+    * Creates a PMInteriorEdit with parent and name
     */
-   PMInteriorEdit( TQWidget* tqparent, const char* name = 0 );
+   PMInteriorEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pminteriortexture.cpp

@@ -68,8 +68,8 @@ TQString PMInteriorTexture::description( ) const
    return i18n( "interior texture" );
 }
 
-PMDialogEditBase* PMInteriorTexture::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMInteriorTexture::editWidget( TQWidget* parent ) const
 {
-   return new PMInteriorTextureEdit( tqparent );
+   return new PMInteriorTextureEdit( parent );
 }
 

kpovmodeler/pminteriortexture.h

@@ -59,7 +59,7 @@ public:
    /**
     * Returns a new @ref PMTextureEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /** */
    virtual TQString pixmap( ) const { return TQString( "pminteriortexture" ); }
 

kpovmodeler/pminteriortextureedit.cpp

@@ -25,8 +25,8 @@
 #include <klocale.h>
 
 
-PMInteriorTextureEdit::PMInteriorTextureEdit( TQWidget* tqparent, const char* name )
+PMInteriorTextureEdit::PMInteriorTextureEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pminteriortextureedit.h

@@ -38,9 +38,9 @@ class PMInteriorTextureEdit : public PMTextureBaseEdit
    typedef PMTextureBaseEdit Base;
 public:
    /**
-    * Creates a PMTextureEdit with tqparent and name
+    * Creates a PMTextureEdit with parent and name
     */
-   PMInteriorTextureEdit( TQWidget* tqparent, const char* name = 0 );
+   PMInteriorTextureEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmisosurface.cpp

@@ -333,9 +333,9 @@ void PMIsoSurface::setAllIntersections( bool yes )
    }
 }
 
-PMDialogEditBase* PMIsoSurface::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMIsoSurface::editWidget( TQWidget* parent ) const
 {
-   return new PMIsoSurfaceEdit( tqparent );
+   return new PMIsoSurfaceEdit( parent );
 }
 
 void PMIsoSurface::restoreMemento( PMMemento* s )

kpovmodeler/pmisosurface.h

@@ -69,7 +69,7 @@ public:
    /**
     * Returns a new @ref PMIsoSurfaceEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /**
     * Returns the name of the pixmap that is displayed in the tree view
     * and dialog view

kpovmodeler/pmisosurfaceedit.cpp

@@ -28,8 +28,8 @@
 #include <tqcheckbox.h>
 #include <klocale.h>
 
-PMIsoSurfaceEdit::PMIsoSurfaceEdit( TQWidget* tqparent, const char* name )
+PMIsoSurfaceEdit::PMIsoSurfaceEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmisosurfaceedit.h

@@ -45,9 +45,9 @@ class PMIsoSurfaceEdit : public PMSolidObjectEdit
    typedef PMSolidObjectEdit Base;
 public:
    /**
-    * Creates a PMIsoSurfaceEdit with tqparent and name
+    * Creates a PMIsoSurfaceEdit with parent and name
     */
-   PMIsoSurfaceEdit( TQWidget* tqparent, const char* name = 0 );
+   PMIsoSurfaceEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmjuliafractal.cpp

@@ -272,9 +272,9 @@ void PMJuliaFractal::setExponent( const PMVector& e )
    }
 }
 
-PMDialogEditBase* PMJuliaFractal::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMJuliaFractal::editWidget( TQWidget* parent ) const
 {
-   return new PMJuliaFractalEdit( tqparent );
+   return new PMJuliaFractalEdit( parent );
 }
 
 void PMJuliaFractal::restoreMemento( PMMemento* s )

kpovmodeler/pmjuliafractal.h

@@ -72,7 +72,7 @@ public:
    /**
     * Returns a new @ref PMJuliaFractalEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /**
     * Returns the name of the pixmap that is displayed in the tree view
     * and dialog view

kpovmodeler/pmjuliafractaledit.cpp

@@ -27,8 +27,8 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 
-PMJuliaFractalEdit::PMJuliaFractalEdit( TQWidget* tqparent, const char* name )
+PMJuliaFractalEdit::PMJuliaFractalEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmjuliafractaledit.h

@@ -43,9 +43,9 @@ class PMJuliaFractalEdit : public PMSolidObjectEdit
    typedef PMSolidObjectEdit Base;
 public:
    /**
-    * Creates a PMJuliaFractalEdit with tqparent and name
+    * Creates a PMJuliaFractalEdit with parent and name
     */
-   PMJuliaFractalEdit( TQWidget* tqparent, const char* name = 0 );
+   PMJuliaFractalEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmlathe.cpp

@@ -261,9 +261,9 @@ void PMLathe::setPoints( const TQValueList<PMVector>& points )
    }
 }
 
-PMDialogEditBase* PMLathe::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMLathe::editWidget( TQWidget* parent ) const
 {
-   return new PMLatheEdit( tqparent );
+   return new PMLatheEdit( parent );
 }
 
 void PMLathe::createMemento( )

kpovmodeler/pmlathe.h

@@ -74,7 +74,7 @@ public:
    /**
     * Returns a new @ref PMLatheEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /**
     * Returns the name of the pixmap that is displayed in the tree view
     * and dialog view

kpovmodeler/pmlatheedit.cpp

@@ -33,8 +33,8 @@
 #include <kiconloader.h>
 #include <kmessagebox.h>
 
-PMLatheEdit::PMLatheEdit( TQWidget* tqparent, const char* name )
+PMLatheEdit::PMLatheEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }

kpovmodeler/pmlatheedit.h

@@ -47,9 +47,9 @@ class PMLatheEdit : public PMSolidObjectEdit
    typedef PMSolidObjectEdit Base;
 public:
    /**
-    * Creates a PMLatheEdit with tqparent and name
+    * Creates a PMLatheEdit with parent and name
     */
-   PMLatheEdit( TQWidget* tqparent, const char* name = 0 );
+   PMLatheEdit( TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual void displayObject( PMObject* o );

kpovmodeler/pmlayoutsettings.cpp

@@ -31,8 +31,8 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 
-PMLayoutSettings::PMLayoutSettings( TQWidget* tqparent, const char* name )
+PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name )
-      : PMSettingsDialogPage( tqparent, name )
+      : PMSettingsDialogPage( parent, name )
 {
    TQHBoxLayout* htqlayout;
    TQVBoxLayout* vtqlayout;

kpovmodeler/pmlayoutsettings.h

@@ -45,7 +45,7 @@ public:
    /**
     * Default constructor
     */
-   PMLayoutSettings( TQWidget* tqparent, const char* name = 0 );
+   PMLayoutSettings( TQWidget* parent, const char* name = 0 );
    /** */
    virtual void displaySettings( );
    /** */

kpovmodeler/pmlibrarybrowser.cpp

@@ -47,9 +47,9 @@
 
 // ************** PMLibraryBrowser **************************
 
-PMLibraryBrowserView::PMLibraryBrowserView( PMPart* /*part*/, TQWidget* tqparent /*= 0*/,
+PMLibraryBrowserView::PMLibraryBrowserView( PMPart* /*part*/, TQWidget* parent /*= 0*/,
                                     const char* name /*=0*/ )
-      : PMViewBase( tqparent, name )
+      : PMViewBase( parent, name )
 {
    TQHBoxLayout* hl = new TQHBoxLayout( this );
    PMLibraryBrowserViewWidget* tv = new PMLibraryBrowserViewWidget( this );
@@ -61,8 +61,8 @@ TQString PMLibraryBrowserView::description( ) const
    return i18n( "Library View" );
 }
 
-PMLibraryBrowserViewWidget::PMLibraryBrowserViewWidget( TQWidget* tqparent, const char* name )
+PMLibraryBrowserViewWidget::PMLibraryBrowserViewWidget( TQWidget* parent, const char* name )
-      : TQWidget( tqparent, name )
+      : TQWidget( parent, name )
 {
    setCaption( i18n( "Library Objects" ) );
 

kpovmodeler/pmlibrarybrowser.h

@@ -53,7 +53,7 @@ public:
    /**
     * Default constructor
     */
-   PMLibraryBrowserView( PMPart* part, TQWidget* tqparent, const char* name = 0 );
+   PMLibraryBrowserView( PMPart* part, TQWidget* parent, const char* name = 0 );
 
    /** */
    virtual TQString viewType( ) const { return TQString( "librarybrowserview" ); }
@@ -69,7 +69,7 @@ class PMLibraryBrowserViewWidget: public TQWidget
    Q_OBJECT
   TQ_OBJECT
 public:
-   PMLibraryBrowserViewWidget( TQWidget *tqparent, const char* name = NULL );
+   PMLibraryBrowserViewWidget( TQWidget *parent, const char* name = NULL );
 
 private slots:
    void resizeEvent( TQResizeEvent* ev );
@@ -112,9 +112,9 @@ public:
    virtual TQString viewType( ) const { return TQString( "librarybrowserview" ); }
    virtual TQString description( ) const;
    virtual TQString iconName( ) const { return TQString( "pmlibrarybrowserview" ); }
-   virtual PMViewBase* newInstance( TQWidget* tqparent, PMPart* part ) const
+   virtual PMViewBase* newInstance( TQWidget* parent, PMPart* part ) const
    {
-      return new PMLibraryBrowserView( part, tqparent );
+      return new PMLibraryBrowserView( part, parent );
    }
 };
 

kpovmodeler/pmlibraryentrypreview.cpp

@@ -39,8 +39,8 @@
 #include <kmessagebox.h>
 #include <kfiledialog.h>
 
-PMLibraryEntryPreview::PMLibraryEntryPreview( TQWidget* tqparent ) :
+PMLibraryEntryPreview::PMLibraryEntryPreview( TQWidget* parent ) :
-   TQWidget( tqparent )
+   TQWidget( parent )
 {
    setAcceptDrops( true );
    m_pPart = new PMPart( this, "treeview", NULL, "part", false, true );

kpovmodeler/pmlibraryentrypreview.h

@@ -45,7 +45,7 @@ class PMLibraryEntryPreview: public TQWidget
   TQ_OBJECT
 public:
    /** Constructor */
-   PMLibraryEntryPreview( TQWidget *tqparent );
+   PMLibraryEntryPreview( TQWidget *parent );
    /** Destructor */
    ~PMLibraryEntryPreview( );
 

kpovmodeler/pmlibraryhandle.h

@@ -180,8 +180,8 @@ public:
    bool isSubLibrary( ) const { return m_subLibrary; }
 
    /**
-    * Changes the tqparent library if this is a sub library
+    * Changes the parent library if this is a sub library
-    * @param parentPath The new tqparent path for this library
+    * @param parentPath The new parent path for this library
     * @return PMLibraryHandle::Ok if successful or the reason for failure
     */
    PMLibraryHandle::PMResult changeParentLibrary( const TQString& parentPath );

kpovmodeler/pmlibraryhandleedit.cpp

@@ -36,8 +36,8 @@
 
 TQSize PMLibraryHandleEdit::s_size = TQSize( 600, 400 );
 
-PMLibraryHandleEdit::PMLibraryHandleEdit( PMLibraryHandle* lib, TQWidget* tqparent, const char* name )
+PMLibraryHandleEdit::PMLibraryHandleEdit( PMLibraryHandle* lib, TQWidget* parent, const char* name )
-      : KDialogBase( tqparent, name, true, i18n( "Create Library" ),
+      : KDialogBase( parent, name, true, i18n( "Create Library" ),
                      Ok | Cancel, Ok )
 {
    m_pLibrary = lib;

kpovmodeler/pmlibraryhandleedit.h

@@ -43,7 +43,7 @@ public:
     * Construct a dialog to edit the properties of lib. The library will be
     * modified only if Ok is pressed.
     */
-   PMLibraryHandleEdit( PMLibraryHandle* lib, TQWidget *tqparent = NULL, const char* name = NULL );
+   PMLibraryHandleEdit( PMLibraryHandle* lib, TQWidget *parent = NULL, const char* name = NULL );
 
    static void saveConfig( KConfig* cfg );
    static void restoreConfig( KConfig* cfg );

kpovmodeler/pmlibraryiconview.cpp

@@ -104,8 +104,8 @@ void PMLibraryIconDrag::append( const TQIconDragItem &item, const TQRect &pr,
    m_subLibs.append( isSubLibrary );
 }
 
-PMLibraryIconView::PMLibraryIconView( TQWidget* tqparent, const char* name )
+PMLibraryIconView::PMLibraryIconView( TQWidget* parent, const char* name )
-      : KIconView( tqparent, name )
+      : KIconView( parent, name )
 {
    m_pLibrary = NULL;
    m_pCurrentLibrary = NULL;
@@ -192,15 +192,15 @@ TQDragObject* PMLibraryIconView::dragObject( )
    return drag;
 }
 
-PMLibraryIconViewItem::PMLibraryIconViewItem( TQIconView *tqparent, const TQString &text, const TQString& path, bool isSubLibrary )
+PMLibraryIconViewItem::PMLibraryIconViewItem( TQIconView *parent, const TQString &text, const TQString& path, bool isSubLibrary )
-   : KIconViewItem( tqparent, text )
+   : KIconViewItem( parent, text )
 {
    m_path = path;
    m_isSubLibrary = isSubLibrary;
 }
 
-PMLibraryIconViewItem::PMLibraryIconViewItem( TQIconView *tqparent, const TQString &text, const TQImage& image, const TQString& path, bool isSubLibrary )
+PMLibraryIconViewItem::PMLibraryIconViewItem( TQIconView *parent, const TQString &text, const TQImage& image, const TQString& path, bool isSubLibrary )
-   : KIconViewItem( tqparent, text, image )
+   : KIconViewItem( parent, text, image )
 {
    m_path = path;
    m_isSubLibrary = isSubLibrary;

kpovmodeler/pmlibraryiconview.h

@@ -65,7 +65,7 @@ class PMLibraryIconView: public KIconView
    Q_OBJECT
   TQ_OBJECT
 public:
-   PMLibraryIconView( TQWidget *tqparent, const char* name = NULL );
+   PMLibraryIconView( TQWidget *parent, const char* name = NULL );
 
    /**
     * Set the library base path
@@ -101,8 +101,8 @@ private:
 class PMLibraryIconViewItem: public KIconViewItem
 {
 public:
-   PMLibraryIconViewItem( TQIconView *tqparent, const TQString& text, const TQString& path, bool isSubLibrary );
+   PMLibraryIconViewItem( TQIconView *parent, const TQString& text, const TQString& path, bool isSubLibrary );
-   PMLibraryIconViewItem( TQIconView *tqparent, const TQString& text, const TQImage& image, const TQString& path, bool isSubLibrary );
+   PMLibraryIconViewItem( TQIconView *parent, const TQString& text, const TQImage& image, const TQString& path, bool isSubLibrary );
 
    /** Get the path of the entry */
    TQString path( ) const { return m_path; }

kpovmodeler/pmlibraryobjectsearch.cpp

@@ -34,8 +34,8 @@
 #include <kdialog.h>
 #include <klistview.h>
 
-PMLibraryObjectSearch::PMLibraryObjectSearch( TQWidget* tqparent ) :
+PMLibraryObjectSearch::PMLibraryObjectSearch( TQWidget* parent ) :
-   TQWidget( tqparent, "" )
+   TQWidget( parent, "" )
 {
    setMinimumSize( 780, 300 );
    setMaximumSize( 800, 400 );

kpovmodeler/pmlibraryobjectsearch.h

@@ -41,7 +41,7 @@ class PMLibraryObjectSearch: public TQWidget
    Q_OBJECT
   TQ_OBJECT
 public:
-   PMLibraryObjectSearch( TQWidget *tqparent );
+   PMLibraryObjectSearch( TQWidget *parent );
 
 private slots:
    void slotSearchButtonPressed( );

kpovmodeler/pmlight.cpp

@@ -564,9 +564,9 @@ void PMLight::setMediaAttenuation( bool y )
    }
 }
 
-PMDialogEditBase* PMLight::editWidget( TQWidget* tqparent ) const
+PMDialogEditBase* PMLight::editWidget( TQWidget* parent ) const
 {
-   return new PMLightEdit( tqparent );
+   return new PMLightEdit( parent );
 }
 
 void PMLight::restoreMemento( PMMemento* s )

kpovmodeler/pmlight.h

@@ -69,7 +69,7 @@ public:
    /**
     * Returns a new @ref PMLightEdit
     */
-   virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const;
+   virtual PMDialogEditBase* editWidget( TQWidget* parent ) const;
    /**
     * Returns the name of the pixmap that is displayed in the tree view
     * and dialog view

kpovmodeler/pmlightedit.cpp

@@ -29,8 +29,8 @@
 
 #include <klocale.h>
 
-PMLightEdit::PMLightEdit( TQWidget* tqparent, const char* name )
+PMLightEdit::PMLightEdit( TQWidget* parent, const char* name )
-      : Base( tqparent, name )
+      : Base( parent, name )
 {
    m_pDisplayedObject = 0;
 }