diff options
931 files changed, 2812 insertions, 2812 deletions
diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp index 5ca35e81..fe4739de 100644 --- a/kamera/kcontrol/kamera.cpp +++ b/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 &) - : KCModule(KKameraConfigFactory::instance(), tqparent, name) +KKameraConfig::KKameraConfig(TQWidget *parent, const char *name, const TQStringList &) + : KCModule(KKameraConfigFactory::instance(), parent, name) { m_devicePopup = new KPopupMenu(this); m_actions = new KActionCollection(this); diff --git a/kamera/kcontrol/kamera.h b/kamera/kcontrol/kamera.h index 537522f6..ca7cd8a9 100644 --- a/kamera/kcontrol/kamera.h +++ b/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 diff --git a/kamera/kcontrol/kameraconfigdialog.cpp b/kamera/kcontrol/kameraconfigdialog.cpp index 914e17ab..17a2c249 100644 --- a/kamera/kcontrol/kameraconfigdialog.cpp +++ b/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; } diff --git a/kamera/kcontrol/kameraconfigdialog.h b/kamera/kcontrol/kameraconfigdialog.h index d02a6ed1..65b3bada 100644 --- a/kamera/kcontrol/kameraconfigdialog.h +++ b/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; diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp index a38ed0b7..9ce6deae 100644 --- a/kamera/kcontrol/kameradevice.cpp +++ b/kamera/kcontrol/kameradevice.cpp @@ -270,8 +270,8 @@ CameraAbilities KCamera::abilities() // ---------- KameraSelectCamera ------------ -KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *tqparent, KCamera *device) - : KDialogBase(tqparent, "kkameradeviceselect", true, i18n("Select Camera Device"), Ok | Cancel, Ok, true) +KameraDeviceSelectDialog::KameraDeviceSelectDialog(TQWidget *parent, KCamera *device) + : KDialogBase(parent, "kkameradeviceselect", true, i18n("Select Camera Device"), Ok | Cancel, Ok, true) { m_device = device; connect(m_device, TQT_SIGNAL(error(const TQString &)), diff --git a/kamera/kcontrol/kameradevice.h b/kamera/kcontrol/kameradevice.h index 698622df..49acdc34 100644 --- a/kamera/kcontrol/kameradevice.h +++ b/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: diff --git a/kamera/kioslave/kamera.cpp b/kamera/kioslave/kamera.cpp index 4ef47238..7e8c9387 100644 --- a/kamera/kioslave/kamera.cpp +++ b/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 diff --git a/kcoloredit/colorselector.cpp b/kcoloredit/colorselector.cpp index af209147..acf1fd06 100644 --- a/kcoloredit/colorselector.cpp +++ b/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); /* diff --git a/kcoloredit/colorselector.h b/kcoloredit/colorselector.h index 5c3d9b62..4a02c1e0 100644 --- a/kcoloredit/colorselector.h +++ b/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(); diff --git a/kcoloredit/gradientselection.cpp b/kcoloredit/gradientselection.cpp index 1399a952..fd1b7a87 100644 --- a/kcoloredit/gradientselection.cpp +++ b/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); diff --git a/kcoloredit/gradientselection.h b/kcoloredit/gradientselection.h index e3e58d1c..526e5696 100644 --- a/kcoloredit/gradientselection.h +++ b/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); diff --git a/kcoloredit/imageselection.cpp b/kcoloredit/imageselection.cpp index a82bdfdb..b6d47c47 100644 --- a/kcoloredit/imageselection.cpp +++ b/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(){ } diff --git a/kcoloredit/imageselection.h b/kcoloredit/imageselection.h index a773cdcc..769382d2 100644 --- a/kcoloredit/imageselection.h +++ b/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: diff --git a/kcoloredit/kcoloreditdoc.cpp b/kcoloredit/kcoloreditdoc.cpp index 449c78f3..0669380b 100644 --- a/kcoloredit/kcoloreditdoc.cpp +++ b/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; diff --git a/kcoloredit/kcoloreditdoc.h b/kcoloredit/kcoloreditdoc.h index 9f65c25e..afbb65c0 100644 --- a/kcoloredit/kcoloreditdoc.h +++ b/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(); diff --git a/kcoloredit/kcoloreditview.cpp b/kcoloredit/kcoloreditview.cpp index e7251ec7..32e61a06 100644 --- a/kcoloredit/kcoloreditview.cpp +++ b/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, "" )); diff --git a/kcoloredit/kcoloreditview.h b/kcoloredit/kcoloreditview.h index 1ede4427..74b16d43 100644 --- a/kcoloredit/kcoloreditview.h +++ b/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 diff --git a/kcoloredit/kxycolorselector.cpp b/kcoloredit/kxycolorselector.cpp index bcd58f00..68df676d 100644 --- a/kcoloredit/kxycolorselector.cpp +++ b/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); diff --git a/kcoloredit/kxycolorselector.h b/kcoloredit/kxycolorselector.h index 263a39f3..ab6cf926 100644 --- a/kcoloredit/kxycolorselector.h +++ b/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); diff --git a/kcoloredit/kzcolorselector.cpp b/kcoloredit/kzcolorselector.cpp index b0f7914a..c705cad0 100644 --- a/kcoloredit/kzcolorselector.cpp +++ b/kcoloredit/kzcolorselector.cpp @@ -23,8 +23,8 @@ #include "main.h" #include "kzcolorselector.h" -KZColorSelector::KZColorSelector(Qt::Orientation o, TQWidget *tqparent, const char *name) : - KSelector(o, tqparent, name) { +KZColorSelector::KZColorSelector(Qt::Orientation o, TQWidget *parent, const char *name) : + KSelector(o, parent, name) { baseColorH = -1; baseColorS = 0; baseColorV = 0; diff --git a/kcoloredit/kzcolorselector.h b/kcoloredit/kzcolorselector.h index f226d744..6996817d 100644 --- a/kcoloredit/kzcolorselector.h +++ b/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); diff --git a/kcoloredit/loadpalettedlg.cpp b/kcoloredit/loadpalettedlg.cpp index 35fceb26..23def4d5 100644 --- a/kcoloredit/loadpalettedlg.cpp +++ b/kcoloredit/loadpalettedlg.cpp @@ -31,8 +31,8 @@ #include "palette.h" #include "loadpalettedlg.h" -LoadPaletteDlg::LoadPaletteDlg(TQWidget *tqparent, const char *name) - : KDialogBase(tqparent, name, true, i18n( "Load Palette" ), +LoadPaletteDlg::LoadPaletteDlg(TQWidget *parent, const char *name) + : KDialogBase(parent, name, true, i18n( "Load Palette" ), Ok|Cancel, Ok, true) { fileName = ""; TQWidget *mainWidget = new TQWidget( this ); diff --git a/kcoloredit/loadpalettedlg.h b/kcoloredit/loadpalettedlg.h index 7e71e2f5..3a2383e7 100644 --- a/kcoloredit/loadpalettedlg.h +++ b/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 */ diff --git a/kcoloredit/paletteview.cpp b/kcoloredit/paletteview.cpp index d62ec43f..52e8b4be 100644 --- a/kcoloredit/paletteview.cpp +++ b/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) : - TQFrame(tqparent, name, TQWidget::WResizeNoErase*0) { + KColorEditView* view, TQWidget *parent, const char *name) : + TQFrame(parent, name, TQWidget::WResizeNoErase*0) { setFrameStyle(StyledPanel|Sunken); setLineWidth(2); TQGridLayout* topLayout = new TQGridLayout(this, 2, 2); diff --git a/kcoloredit/paletteview.h b/kcoloredit/paletteview.h index cc1e56b8..d5ddcb0d 100644 --- a/kcoloredit/paletteview.h +++ b/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(); diff --git a/kcoloredit/paletteviewscrolledarea.cpp b/kcoloredit/paletteviewscrolledarea.cpp index f6aa47cb..63cb3f9b 100644 --- a/kcoloredit/paletteviewscrolledarea.cpp +++ b/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) - : TQFrame(tqparent, name) { + TQScrollBar* hScrollBar, KColorEditView* view, TQWidget* parent, const char* name) + : TQFrame(parent, name) { this->defaultCellWidth = defaultCellWidth; this->defaultCellHeight = defaultCellHeight; this->cellSpacing = cellSpacing; diff --git a/kcoloredit/paletteviewscrolledarea.h b/kcoloredit/paletteviewscrolledarea.h index 9f708b85..3202c317 100644 --- a/kcoloredit/paletteviewscrolledarea.h +++ b/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(); diff --git a/kcoloredit/texteditselection.cpp b/kcoloredit/texteditselection.cpp index bf00ab3d..1b49ec6a 100644 --- a/kcoloredit/texteditselection.cpp +++ b/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); diff --git a/kcoloredit/texteditselection.h b/kcoloredit/texteditselection.h index 67a299a1..e0ef91f5 100644 --- a/kcoloredit/texteditselection.h +++ b/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: diff --git a/kcoloredit/textselection.cpp b/kcoloredit/textselection.cpp index ae15650d..f916d48f 100644 --- a/kcoloredit/textselection.cpp +++ b/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(){ diff --git a/kdvi/TeXFont.h b/kdvi/TeXFont.h index 518c0d0f..39fedb76 100644 --- a/kdvi/TeXFont.h +++ b/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 diff --git a/kdvi/TeXFont_PFB.cpp b/kdvi/TeXFont_PFB.cpp index a017259d..45c76512 100644 --- a/kdvi/TeXFont_PFB.cpp +++ b/kdvi/TeXFont_PFB.cpp @@ -26,28 +26,28 @@ //#define DEBUG_PFB 1 -TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *tqparent, fontEncoding *enc, double slant) - : TeXFont(tqparent) +TeXFont_PFB::TeXFont_PFB(TeXFontDefinition *parent, fontEncoding *enc, double slant) + : 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" )); - tqparent->fullEncodingName = enc->encodingFullName.remove(TQString::tqfromLatin1( "encoding" )); + parent->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; diff --git a/kdvi/TeXFont_PFB.h b/kdvi/TeXFont_PFB.h index 45d94be4..ed80d72b 100644 --- a/kdvi/TeXFont_PFB.h +++ b/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); diff --git a/kdvi/TeXFont_PK.cpp b/kdvi/TeXFont_PK.cpp index 496e8ff9..f678df9b 100644 --- a/kdvi/TeXFont_PK.cpp +++ b/kdvi/TeXFont_PK.cpp @@ -80,18 +80,18 @@ extern void oops(TQString message); -TeXFont_PK::TeXFont_PK(TeXFontDefinition *tqparent) - : TeXFont(tqparent) +TeXFont_PK::TeXFont_PK(TeXFontDefinition *parent) + : 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? } diff --git a/kdvi/TeXFont_PK.h b/kdvi/TeXFont_PK.h index 68935d16..ab9c6b5c 100644 --- a/kdvi/TeXFont_PK.h +++ b/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); diff --git a/kdvi/TeXFont_TFM.cpp b/kdvi/TeXFont_TFM.cpp index ebd1b7f5..456a27c3 100644 --- a/kdvi/TeXFont_TFM.cpp +++ b/kdvi/TeXFont_TFM.cpp @@ -21,14 +21,14 @@ //#define DEBUG_TFM -TeXFont_TFM::TeXFont_TFM(TeXFontDefinition *tqparent) - : TeXFont(tqparent) +TeXFont_TFM::TeXFont_TFM(TeXFontDefinition *parent) + : 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); diff --git a/kdvi/TeXFont_TFM.h b/kdvi/TeXFont_TFM.h index 9a3639e0..1d10dc1b 100644 --- a/kdvi/TeXFont_TFM.h +++ b/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); diff --git a/kdvi/dviRenderer.cpp b/kdvi/dviRenderer.cpp index 7f21c65d..acb3dceb 100644 --- a/kdvi/dviRenderer.cpp +++ b/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 diff --git a/kdvi/dviRenderer.h b/kdvi/dviRenderer.h index 6d71b1ed..bf3512db 100644 --- a/kdvi/dviRenderer.h +++ b/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); diff --git a/kdvi/dviWidget.cpp b/kdvi/dviWidget.cpp index 68f4b124..a0f43da3 100644 --- a/kdvi/dviWidget.cpp +++ b/kdvi/dviWidget.cpp @@ -22,8 +22,8 @@ #include "renderedDviPagePixmap.h" #include "selection.h" -DVIWidget::DVIWidget(TQWidget* tqparent, PageView* sv, DocumentPageCache* cache, const char* name) - : DocumentWidget(tqparent, sv, cache, name) +DVIWidget::DVIWidget(TQWidget* parent, PageView* sv, DocumentPageCache* cache, const char* 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); } diff --git a/kdvi/dviWidget.h b/kdvi/dviWidget.h index 864bb526..7f37c44c 100644 --- a/kdvi/dviWidget.h +++ b/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*); diff --git a/kdvi/fontprogress.cpp b/kdvi/fontprogress.cpp index 19fe63cd..24810714 100644 --- a/kdvi/fontprogress.cpp +++ b/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) - : KDialogBase( tqparent, "Font Generation Progress Dialog", true, name, Cancel, Cancel, true ) +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( parent, "Font Generation Progress Dialog", true, name, Cancel, Cancel, true ) { setCursor( TQCursor( 3 ) ); diff --git a/kdvi/fontprogress.h b/kdvi/fontprogress.h index 6c19520c..5ecd3e92 100644 --- a/kdvi/fontprogress.h +++ b/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 diff --git a/kdvi/infodialog.cpp b/kdvi/infodialog.cpp index 3e2bbf16..97ffef6f 100644 --- a/kdvi/infodialog.cpp +++ b/kdvi/infodialog.cpp @@ -21,8 +21,8 @@ #include "fontpool.h" #include "infodialog.h" -infoDialog::infoDialog( TQWidget* tqparent ) - : KDialogBase( Tabbed, i18n("Document Info"), Ok, Ok, tqparent, "Document Info", false, false) +infoDialog::infoDialog( TQWidget* parent ) + : 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 ); diff --git a/kdvi/infodialog.h b/kdvi/infodialog.h index d7f37e56..a5ecde8b 100644 --- a/kdvi/infodialog.h +++ b/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: diff --git a/kdvi/kdvi_multipage.cpp b/kdvi/kdvi_multipage.cpp index bceacddc..e318a160 100644 --- a/kdvi/kdvi_multipage.cpp +++ b/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; diff --git a/kdvi/kdvi_multipage.h b/kdvi/kdvi_multipage.h index ee50e218..9e2137a7 100644 --- a/kdvi/kdvi_multipage.h +++ b/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(); diff --git a/kdvi/optionDialogFontsWidget.cpp b/kdvi/optionDialogFontsWidget.cpp index 60a52c66..14a72ee2 100644 --- a/kdvi/optionDialogFontsWidget.cpp +++ b/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_base( tqparent, name, fl ) +optionDialogFontsWidget::optionDialogFontsWidget( TQWidget* parent, const char* name, WFlags fl ) + : optionDialogFontsWidget_base( parent, name, fl ) { #ifndef HAVE_FREETYPE kcfg_UseType1Fonts->setChecked(false); diff --git a/kdvi/optionDialogFontsWidget.h b/kdvi/optionDialogFontsWidget.h index ce8c85f3..c5f0bc06 100644 --- a/kdvi/optionDialogFontsWidget.h +++ b/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(); }; diff --git a/kdvi/optionDialogSpecialWidget.cpp b/kdvi/optionDialogSpecialWidget.cpp index 6c27b019..1b61e4a5 100644 --- a/kdvi/optionDialogSpecialWidget.cpp +++ b/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_base( tqparent, name, fl ) +optionDialogSpecialWidget::optionDialogSpecialWidget( TQWidget* parent, const char* name, WFlags fl ) + : optionDialogSpecialWidget_base( parent, name, fl ) { // Set up the list of known and supported editors editorNameString += i18n("User-Defined Editor"); diff --git a/kdvi/optionDialogSpecialWidget.h b/kdvi/optionDialogSpecialWidget.h index 42c16c27..5bafd618 100644 --- a/kdvi/optionDialogSpecialWidget.h +++ b/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: diff --git a/kdvi/psheader.txt b/kdvi/psheader.txt index 244e4a3b..f5e543d1 100644 --- a/kdvi/psheader.txt +++ b/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} diff --git a/kfax/kfax.h b/kfax/kfax.h index 5319a254..6372d860 100644 --- a/kfax/kfax.h +++ b/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); diff --git a/kfax/kfax_printsettings.cpp b/kfax/kfax_printsettings.cpp index 3ddae4ab..5382c2e5 100644 --- a/kfax/kfax_printsettings.cpp +++ b/kfax/kfax_printsettings.cpp @@ -24,8 +24,8 @@ #include <tqlayout.h> #include <tqwhatsthis.h> -KFAXPrintSettings::KFAXPrintSettings(TQWidget *tqparent, const char *name) -: KPrintDialogPage(tqparent, name) +KFAXPrintSettings::KFAXPrintSettings(TQWidget *parent, const char *name) +: KPrintDialogPage(parent, name) { TQString whatsThisScaleFullPage = i18n( "<qt>" "<p><strong>'Ignore Paper Margins'</strong></p>" diff --git a/kfax/kfax_printsettings.h b/kfax/kfax_printsettings.h index ea37fa0a..135788a6 100644 --- a/kfax/kfax_printsettings.h +++ b/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); diff --git a/kfax/options.cpp b/kfax/options.cpp index f1490989..053bf162 100644 --- a/kfax/options.cpp +++ b/kfax/options.cpp @@ -48,8 +48,8 @@ #include "kfax.h" #include "options.h" -OptionsDialog::OptionsDialog( TQWidget *tqparent, const char *name) - : KDialogBase( tqparent, name, true, i18n("Configure"), Ok|Cancel) +OptionsDialog::OptionsDialog( TQWidget *parent, const char *name) + : KDialogBase( parent, name, true, i18n("Configure"), Ok|Cancel) { TQWidget *mainWidget = new TQWidget(this); setMainWidget(mainWidget); diff --git a/kfax/options.h b/kfax/options.h index 96c2a500..61bfa14c 100644 --- a/kfax/options.h +++ b/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); diff --git a/kfaxview/faxmultipage.cpp b/kfaxview/faxmultipage.cpp index 2f3fc5b4..44c1e273 100644 --- a/kfaxview/faxmultipage.cpp +++ b/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. */ diff --git a/kfaxview/faxmultipage.h b/kfaxview/faxmultipage.h index b9e3219d..13602763 100644 --- a/kfaxview/faxmultipage.h +++ b/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 diff --git a/kfaxview/faxrenderer.cpp b/kfaxview/faxrenderer.cpp index ee4c84a0..b109c1f5 100644 --- a/kfaxview/faxrenderer.cpp +++ b/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 } diff --git a/kfaxview/faxrenderer.h b/kfaxview/faxrenderer.h index d7022b61..c09f9b8f 100644 --- a/kfaxview/faxrenderer.h +++ b/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 diff --git a/kfaxview/libkfaximage/kfaximage.cpp b/kfaxview/libkfaximage/kfaximage.cpp index ea0d4943..0d35f8d7 100644 --- a/kfaxview/libkfaximage/kfaximage.cpp +++ b/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 ) - : TQObject(tqparent,name) +KFaxImage::KFaxImage( const TQString &filename, TQObject *parent, const char *name ) + : TQObject(parent,name) { KGlobal::locale()->insertCatalogue( TQString::tqfromLatin1("libkfaximage") ); loadImage(filename); diff --git a/kfaxview/libkfaximage/kfaximage.h b/kfaxview/libkfaximage/kfaximage.h index 52dd7736..89212ffd 100644 --- a/kfaxview/libkfaximage/kfaximage.h +++ b/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 diff --git a/kfile-plugins/bmp/kfile_bmp.cpp b/kfile-plugins/bmp/kfile_bmp.cpp index a682da7c..cfda7a16 100644 --- a/kfile-plugins/bmp/kfile_bmp.cpp +++ b/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" ); diff --git a/kfile-plugins/bmp/kfile_bmp.h b/kfile-plugins/bmp/kfile_bmp.h index c2c5c007..050e68d8 100644 --- a/kfile-plugins/bmp/kfile_bmp.h +++ b/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); }; diff --git a/kfile-plugins/dds/kfile_dds.cpp b/kfile-plugins/dds/kfile_dds.cpp index 17321e13..c392685f 100644 --- a/kfile-plugins/dds/kfile_dds.cpp +++ b/kfile-plugins/dds/kfile_dds.cpp @@ -90,10 +90,10 @@ namespace { // Private. uint flags; uint fourcc; uint bitcount; - uint rtqmask; - uint gtqmask; - uint btqmask; - uint atqmask; + uint rmask; + uint gmask; + uint bmask; + 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.gtqmask; - s >> pf.btqmask; - s >> pf.atqmask; + s >> pf.rmask; + s >> pf.gmask; + s >> pf.bmask; + 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) : - KFilePlugin(tqparent, name, args) +KDdsPlugin::KDdsPlugin(TQObject *parent, const char *name, const TQStringList &args) : + KFilePlugin(parent, name, args) { KFileMimeTypeInfo * info = addMimeTypeInfo( "image/x-dds" ); diff --git a/kfile-plugins/dds/kfile_dds.h b/kfile-plugins/dds/kfile_dds.h index 19ef6a12..2edaf72e 100644 --- a/kfile-plugins/dds/kfile_dds.h +++ b/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); }; diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc b/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc index 6d209c2b..445417a2 100644 --- a/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc +++ b/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(); diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-private.h b/kfile-plugins/dependencies/poppler-tqt/poppler-private.h index b1b79084..8152ffd8 100644 --- a/kfile-plugins/dependencies/poppler-tqt/poppler-private.h +++ b/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; diff --git a/kfile-plugins/dvi/kfile_dvi.cpp b/kfile-plugins/dvi/kfile_dvi.cpp index 1d035fa0..b449ad1e 100644 --- a/kfile-plugins/dvi/kfile_dvi.cpp +++ b/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) - : KFilePlugin(tqparent, name, preferredItems) +KDviPlugin::KDviPlugin (TQObject * parent, const char * name, const TQStringList & preferredItems) + : KFilePlugin(parent, name, preferredItems) { kdDebug(7034) << "dvi plugin" << endl; diff --git a/kfile-plugins/dvi/kfile_dvi.h b/kfile-plugins/dvi/kfile_dvi.h index aba32132..54cbee51 100644 --- a/kfile-plugins/dvi/kfile_dvi.h +++ b/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); }; diff --git a/kfile-plugins/exr/kfile_exr.cpp b/kfile-plugins/exr/kfile_exr.cpp index 18432fc8..0a85a728 100644 --- a/kfile-plugins/exr/kfile_exr.cpp +++ b/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" ); diff --git a/kfile-plugins/exr/kfile_exr.h b/kfile-plugins/exr/kfile_exr.h index ef718b37..19d58e1d 100644 --- a/kfile-plugins/exr/kfile_exr.h +++ b/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 ); }; diff --git a/kfile-plugins/gif/kfile_gif.cpp b/kfile-plugins/gif/kfile_gif.cpp index 9c45f257..009f8cc5 100644 --- a/kfile-plugins/gif/kfile_gif.cpp +++ b/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"; diff --git a/kfile-plugins/gif/kfile_gif.h b/kfile-plugins/gif/kfile_gif.h index a5d69910..9e1b9907 100644 --- a/kfile-plugins/gif/kfile_gif.h +++ b/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 ); }; diff --git a/kfile-plugins/ico/kfile_ico.cpp b/kfile-plugins/ico/kfile_ico.cpp index 2bc46298..44fa28d6 100644 --- a/kfile-plugins/ico/kfile_ico.cpp +++ b/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" ); diff --git a/kfile-plugins/ico/kfile_ico.h b/kfile-plugins/ico/kfile_ico.h index 81ef53af..e340646a 100644 --- a/kfile-plugins/ico/kfile_ico.h +++ b/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); }; diff --git a/kfile-plugins/jpeg/kfile_jpeg.cpp b/kfile-plugins/jpeg/kfile_jpeg.cpp index 2472ac70..5bbd394d 100644 --- a/kfile-plugins/jpeg/kfile_jpeg.cpp +++ b/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; } diff --git a/kfile-plugins/jpeg/kfile_jpeg.h b/kfile-plugins/jpeg/kfile_jpeg.h index ec6861d8..9a80a7f8 100644 --- a/kfile-plugins/jpeg/kfile_jpeg.h +++ b/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 ); diff --git a/kfile-plugins/pcx/kfile_pcx.cpp b/kfile-plugins/pcx/kfile_pcx.cpp index bd81e3f7..5dceec9d 100644 --- a/kfile-plugins/pcx/kfile_pcx.cpp +++ b/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, - const TQStringList &args ) : KFilePlugin( tqparent, name, args ) +KPcxPlugin::KPcxPlugin( TQObject *parent, const char *name, + const TQStringList &args ) : KFilePlugin( parent, name, args ) { kdDebug(7034) << "PCX file meta info plugin" << endl; KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-pcx" ); diff --git a/kfile-plugins/pcx/kfile_pcx.h b/kfile-plugins/pcx/kfile_pcx.h index f406e79f..942c139e 100644 --- a/kfile-plugins/pcx/kfile_pcx.h +++ b/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: diff --git a/kfile-plugins/pdf/kfile_pdf.cpp b/kfile-plugins/pdf/kfile_pdf.cpp index d18ada11..89e46297 100644 --- a/kfile-plugins/pdf/kfile_pdf.cpp +++ b/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) - : KFilePlugin(tqparent, name, preferredItems) +KPdfPlugin::KPdfPlugin(TQObject *parent, const char *name, const TQStringList &preferredItems) + : KFilePlugin(parent, name, preferredItems) { kdDebug(7034) << "pdf plugin\n"; diff --git a/kfile-plugins/pdf/kfile_pdf.h b/kfile-plugins/pdf/kfile_pdf.h index b14d3989..f6e279c1 100644 --- a/kfile-plugins/pdf/kfile_pdf.h +++ b/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); }; diff --git a/kfile-plugins/png/kfile_png.cpp b/kfile-plugins/png/kfile_png.cpp index 2f128cf7..531fdfe3 100644 --- a/kfile-plugins/png/kfile_png.cpp +++ b/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"; diff --git a/kfile-plugins/png/kfile_png.h b/kfile-plugins/png/kfile_png.h index 1622efbe..bffc7e0b 100644 --- a/kfile-plugins/png/kfile_png.h +++ b/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 ); }; diff --git a/kfile-plugins/pnm/kfile_pnm.cpp b/kfile-plugins/pnm/kfile_pnm.cpp index ae54b78d..6c965e65 100644 --- a/kfile-plugins/pnm/kfile_pnm.cpp +++ b/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" ); diff --git a/kfile-plugins/pnm/kfile_pnm.h b/kfile-plugins/pnm/kfile_pnm.h index 3b54bdbe..bfd12f48 100644 --- a/kfile-plugins/pnm/kfile_pnm.h +++ b/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: diff --git a/kfile-plugins/ps/kfile_ps.cpp b/kfile-plugins/ps/kfile_ps.cpp index 7121af1b..01136d88 100644 --- a/kfile-plugins/ps/kfile_ps.cpp +++ b/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"; diff --git a/kfile-plugins/ps/kfile_ps.h b/kfile-plugins/ps/kfile_ps.h index 1b978713..c47f3bb7 100644 --- a/kfile-plugins/ps/kfile_ps.h +++ b/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); diff --git a/kfile-plugins/raw/kcamerarawplugin.cpp b/kfile-plugins/raw/kcamerarawplugin.cpp index 62b00404..8a0b0ce8 100644 --- a/kfile-plugins/raw/kcamerarawplugin.cpp +++ b/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; diff --git a/kfile-plugins/raw/kcamerarawplugin.h b/kfile-plugins/raw/kcamerarawplugin.h index fa583c4f..4f441234 100644 --- a/kfile-plugins/raw/kcamerarawplugin.h +++ b/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: diff --git a/kfile-plugins/rgb/kfile_rgb.cpp b/kfile-plugins/rgb/kfile_rgb.cpp index ff6dadde..41bd8c28 100644 --- a/kfile-plugins/rgb/kfile_rgb.cpp +++ b/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) : - KFilePlugin(tqparent, name, args) +KRgbPlugin::KRgbPlugin(TQObject *parent, const char *name, const TQStringList &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); } diff --git a/kfile-plugins/rgb/kfile_rgb.h b/kfile-plugins/rgb/kfile_rgb.h index bbbfd1b4..8e507820 100644 --- a/kfile-plugins/rgb/kfile_rgb.h +++ b/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; }; diff --git a/kfile-plugins/tga/kfile_tga.cpp b/kfile-plugins/tga/kfile_tga.cpp index 46176e3e..b102deb6 100644 --- a/kfile-plugins/tga/kfile_tga.cpp +++ b/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" ); diff --git a/kfile-plugins/tga/kfile_tga.h b/kfile-plugins/tga/kfile_tga.h index ccd5b69d..09ca11a8 100644 --- a/kfile-plugins/tga/kfile_tga.h +++ b/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); }; diff --git a/kfile-plugins/tiff/kfile_tiff.cpp b/kfile-plugins/tiff/kfile_tiff.cpp index 1d8b08f1..ce55e5b3 100644 --- a/kfile-plugins/tiff/kfile_tiff.cpp +++ b/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, - const TQStringList &args) : KFilePlugin(tqparent, name, args) +KTiffPlugin::KTiffPlugin(TQObject *parent, const char *name, + 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, diff --git a/kfile-plugins/tiff/kfile_tiff.h b/kfile-plugins/tiff/kfile_tiff.h index 26ad4765..cf168943 100644 --- a/kfile-plugins/tiff/kfile_tiff.h +++ b/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: diff --git a/kfile-plugins/xbm/kfile_xbm.cpp b/kfile-plugins/xbm/kfile_xbm.cpp index 7929a1bd..2d246c97 100644 --- a/kfile-plugins/xbm/kfile_xbm.cpp +++ b/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" ); diff --git a/kfile-plugins/xbm/kfile_xbm.h b/kfile-plugins/xbm/kfile_xbm.h index b30e04cb..e4033b43 100644 --- a/kfile-plugins/xbm/kfile_xbm.h +++ b/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); diff --git a/kfile-plugins/xpm/kfile_xpm.cpp b/kfile-plugins/xpm/kfile_xpm.cpp index bc6806cf..a121a359 100644 --- a/kfile-plugins/xpm/kfile_xpm.cpp +++ b/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) - : KFilePlugin(tqparent, name, args) +xpmPlugin::xpmPlugin(TQObject *parent, const char *name, const TQStringList &args) + : KFilePlugin(parent, name, args) { KFileMimeTypeInfo* info = addMimeTypeInfo( "image/x-xpm" ); diff --git a/kfile-plugins/xpm/kfile_xpm.h b/kfile-plugins/xpm/kfile_xpm.h index abebe119..d43e80bf 100644 --- a/kfile-plugins/xpm/kfile_xpm.h +++ b/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); }; diff --git a/kgamma/kcmkgamma/displaynumber.cpp b/kgamma/kcmkgamma/displaynumber.cpp index 1bc0473b..8ca9beed 100644 --- a/kgamma/kcmkgamma/displaynumber.cpp +++ b/kgamma/kcmkgamma/displaynumber.cpp @@ -20,8 +20,8 @@ #include "displaynumber.h" -DisplayNumber::DisplayNumber(TQWidget *tqparent, int digits, \ - int prec, const char *name) : TQLabel(tqparent,name) { +DisplayNumber::DisplayNumber(TQWidget *parent, int digits, \ + int prec, const char *name) : TQLabel(parent,name) { setPrecision(prec); setWidth(digits); diff --git a/kgamma/kcmkgamma/displaynumber.h b/kgamma/kcmkgamma/displaynumber.h index 19e41de6..5e9e96b8 100644 --- a/kgamma/kcmkgamma/displaynumber.h +++ b/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); diff --git a/kgamma/kcmkgamma/gammactrl.cpp b/kgamma/kcmkgamma/gammactrl.cpp index efedeefa..4cb49405 100644 --- a/kgamma/kcmkgamma/gammactrl.cpp +++ b/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 ); diff --git a/kgamma/kcmkgamma/gammactrl.h b/kgamma/kcmkgamma/gammactrl.h index 75dfa775..8147ea03 100644 --- a/kgamma/kcmkgamma/gammactrl.h +++ b/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 */ diff --git a/kgamma/kcmkgamma/kgamma.cpp b/kgamma/kcmkgamma/kgamma.cpp index 961a617e..519549c3 100644 --- a/kgamma/kcmkgamma/kgamma.cpp +++ b/kgamma/kcmkgamma/kgamma.cpp @@ -55,8 +55,8 @@ extern "C" } } -KGamma::KGamma(TQWidget *tqparent, const char *name, const TQStringList&) - :KCModule(tqparent,name) +KGamma::KGamma(TQWidget *parent, const char *name, const TQStringList&) + :KCModule(parent,name) { bool ok; GammaCorrection = true; diff --git a/kgamma/kcmkgamma/kgamma.h b/kgamma/kcmkgamma/kgamma.h index 51175ecd..38194a43 100644 --- a/kgamma/kcmkgamma/kgamma.h +++ b/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(); diff --git a/kghostview/fullscreenfilter.cpp b/kghostview/fullscreenfilter.cpp index 9efe8a6c..c1d5117f 100644 --- a/kghostview/fullscreenfilter.cpp +++ b/kghostview/fullscreenfilter.cpp @@ -22,16 +22,16 @@ #include "kgv_miniwidget.h" #include "kgvpageview.h" -FullScreenFilter::FullScreenFilter( KGVShell& tqparent ) - :TQObject( &tqparent, "full-screen-filter" ), - tqparent( tqparent ) +FullScreenFilter::FullScreenFilter( KGVShell& parent ) + :TQObject( &parent, "full-screen-filter" ), + 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() && - tqparent.m_gvpart->pageView()->contentsWidth() <= tqparent.m_gvpart->widget()->width() ) { - tqparent.m_gvpart->miniWidget()->nextPage(); + if ( parent.m_gvpart->pageView()->contentsHeight() <= parent.m_gvpart->widget()->height() && + parent.m_gvpart->pageView()->contentsWidth() <= parent.m_gvpart->widget()->width() ) { + parent.m_gvpart->miniWidget()->nextPage(); mouseevent->accept(); return true; } diff --git a/kghostview/fullscreenfilter.h b/kghostview/fullscreenfilter.h index 4a175c25..c6e72f87 100644 --- a/kghostview/fullscreenfilter.h +++ b/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; }; diff --git a/kghostview/infodialog.cpp b/kghostview/infodialog.cpp index d65348ef..431a0ed7 100644 --- a/kghostview/infodialog.cpp +++ b/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 ) - :KDialogBase( i18n("Document Information"), Yes, Yes, Yes, tqparent, +InfoDialog::InfoDialog( TQWidget *parent, const char *name, bool modal ) + :KDialogBase( i18n("Document Information"), Yes, Yes, Yes, parent, name, modal, true, KStdGuiItem::ok() ) { TQFrame *page = makeMainWidget(); diff --git a/kghostview/infodialog.h b/kghostview/infodialog.h index 8b295b88..af35e997 100644 --- a/kghostview/infodialog.h +++ b/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 ); diff --git a/kghostview/kdscerrordialog.cpp b/kghostview/kdscerrordialog.cpp index b219a061..e831cbcd 100644 --- a/kghostview/kdscerrordialog.cpp +++ b/kghostview/kdscerrordialog.cpp @@ -46,8 +46,8 @@ KDSCErrorHandler::Response KDSCErrorThreshold::error( const KDSCError& err ) return Cancel; } -KDSCErrorDialog::KDSCErrorDialog( TQWidget* tqparent ) : - KDialog( tqparent, "dscerrordialog", true ), +KDSCErrorDialog::KDSCErrorDialog( TQWidget* parent ) : + KDialog( parent, "dscerrordialog", true ), _response( Ok ) { TQVBoxLayout* vbox = new TQVBoxLayout( this, marginHint(), spacingHint() ); diff --git a/kghostview/kdscerrordialog.h b/kghostview/kdscerrordialog.h index 27f948c5..7b9d7cef 100644 --- a/kghostview/kdscerrordialog.h +++ b/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& ); diff --git a/kghostview/kgv_miniwidget.cpp b/kghostview/kgv_miniwidget.cpp index 115434b9..5c17fc19 100644 --- a/kghostview/kgv_miniwidget.cpp +++ b/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(); diff --git a/kghostview/kgv_view.cpp b/kghostview/kgv_view.cpp index dc457516..e8edace1 100644 --- a/kghostview/kgv_view.cpp +++ b/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 ) : - KParts::BrowserExtension( tqparent, "KGVBrowserExtension" ) +KGVBrowserExtension::KGVBrowserExtension( KGVPart *parent ) : + 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(); } diff --git a/kghostview/kgv_view.h b/kghostview/kgv_view.h index a752353c..f3fe468f 100644 --- a/kghostview/kgv_view.h +++ b/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: diff --git a/kghostview/kgvdocument.cpp b/kghostview/kgvdocument.cpp index 9d314596..89cd7948 100644 --- a/kghostview/kgvdocument.cpp +++ b/kghostview/kgvdocument.cpp @@ -801,8 +801,8 @@ void KGVDocument::pdf2psExited( KProcess* process ) } */ -Pdf2dsc::Pdf2dsc( const TQString& ghostscriptPath, TQObject* tqparent, const char* name ) : - TQObject( tqparent, name ), +Pdf2dsc::Pdf2dsc( const TQString& ghostscriptPath, TQObject* parent, const char* name ) : + TQObject( parent, name ), _process( 0 ), _ghostscriptPath( ghostscriptPath ) {} diff --git a/kghostview/kgvdocument.h b/kghostview/kgvdocument.h index dc68765b..5194dc7d 100644 --- a/kghostview/kgvdocument.h +++ b/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 ); diff --git a/kghostview/kgvfactory.cpp b/kghostview/kgvfactory.cpp index 6bf3e213..3309a15e 100644 --- a/kghostview/kgvfactory.cpp +++ b/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 ); diff --git a/kghostview/kgvfactory.h b/kghostview/kgvfactory.h index 664a2656..9a5d507f 100644 --- a/kghostview/kgvfactory.h +++ b/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 ); diff --git a/kghostview/kgvmainwidget.cpp b/kghostview/kgvmainwidget.cpp index 49823ad0..5e9bd40b 100644 --- a/kghostview/kgvmainwidget.cpp +++ b/kghostview/kgvmainwidget.cpp @@ -20,8 +20,8 @@ #include <kurl.h> #include <kurldrag.h> -KGVMainWidget::KGVMainWidget( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) {} +KGVMainWidget::KGVMainWidget( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) {} void KGVMainWidget::keyPressEvent( TQKeyEvent* event ) { diff --git a/kghostview/kgvmainwidget.h b/kghostview/kgvmainwidget.h index 0aa464d3..df280887 100644 --- a/kghostview/kgvmainwidget.h +++ b/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(); diff --git a/kghostview/kgvpagedecorator.cpp b/kghostview/kgvpagedecorator.cpp index d7ea7e0d..a549d95d 100644 --- a/kghostview/kgvpagedecorator.cpp +++ b/kghostview/kgvpagedecorator.cpp @@ -23,8 +23,8 @@ #include "kgvpagedecorator.h" -KGVPageDecorator::KGVPageDecorator( TQWidget* tqparent, const char* name ) : - TQHBox( tqparent, name ), +KGVPageDecorator::KGVPageDecorator( TQWidget* parent, const char* name ) : + TQHBox( parent, name ), _margin( 5 ), _borderWidth( 1 ), _shadowOffset( 2, 2 ) diff --git a/kghostview/kgvpagedecorator.h b/kghostview/kgvpagedecorator.h index 546063bf..d3942afc 100644 --- a/kghostview/kgvpagedecorator.h +++ b/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(); diff --git a/kghostview/kgvpageview.cpp b/kghostview/kgvpageview.cpp index 577a8c98..4761391b 100644 --- a/kghostview/kgvpageview.cpp +++ b/kghostview/kgvpageview.cpp @@ -22,8 +22,8 @@ #include "kgvpageview.h" -KGVPageView::KGVPageView( TQWidget* tqparent, const char* name ) - : TQScrollView( tqparent, name ) +KGVPageView::KGVPageView( TQWidget* parent, const char* name ) + : TQScrollView( parent, name ) { _page = 0; diff --git a/kghostview/kgvpageview.h b/kghostview/kgvpageview.h index 63f9c5af..c0dec421 100644 --- a/kghostview/kgvpageview.h +++ b/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* ); diff --git a/kghostview/kpswidget.cpp b/kghostview/kpswidget.cpp index 389b5284..c6d5d972 100644 --- a/kghostview/kpswidget.cpp +++ b/kghostview/kpswidget.cpp @@ -80,8 +80,8 @@ TQCString palette2String( Configuration::EnumPalette::type palette ) } -KPSWidget::KPSWidget( TQWidget* tqparent, const char* name ) : - TQWidget ( tqparent, name ), +KPSWidget::KPSWidget( TQWidget* parent, const char* name ) : + TQWidget ( parent, name ), _gsWindow ( None ), _usePipe ( false ), _doubleBuffer ( false ), diff --git a/kghostview/kpswidget.h b/kghostview/kpswidget.h index 3420aa6b..90b14e24 100644 --- a/kghostview/kpswidget.h +++ b/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(); /** diff --git a/kghostview/logwindow.cpp b/kghostview/logwindow.cpp index f3f41deb..207e88f1 100644 --- a/kghostview/logwindow.cpp +++ b/kghostview/logwindow.cpp @@ -27,8 +27,8 @@ #include "logwindow.h" LogWindow::LogWindow( const TQString& caption, - TQWidget* tqparent, const char* name) : - KDialogBase( tqparent, name, false, caption, User1|Close, Close, false, + TQWidget* parent, const char* name) : + KDialogBase( parent, name, false, caption, User1|Close, Close, false, KStdGuiItem::clear() ) { TQVBox * display = makeVBoxMainWidget(); diff --git a/kghostview/logwindow.h b/kghostview/logwindow.h index 277bcdfd..b81d0396 100644 --- a/kghostview/logwindow.h +++ b/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 ); diff --git a/kghostview/marklist.cpp b/kghostview/marklist.cpp index 50aa4cbc..ee91af25 100644 --- a/kghostview/marklist.cpp +++ b/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) - : TQWidget( tqparent ), +MarkListItem::MarkListItem(TQWidget *parent, const TQString &text, const TQString &tip, const TQColor &color, KGVMiniWidget* miniW, int pageNum) + : 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) - : TQTable( tqparent, name ), +MarkList::MarkList( TQWidget* parent, const char* name, KGVMiniWidget* mini) + : TQTable( parent, name ), _selected ( -1 ), _miniWidget( mini ) { diff --git a/kghostview/marklist.h b/kghostview/marklist.h index 1977a18d..9b0b7b5e 100644 --- a/kghostview/marklist.h +++ b/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, diff --git a/kghostview/scrollbox.cpp b/kghostview/scrollbox.cpp index f9c23904..0246e893 100644 --- a/kghostview/scrollbox.cpp +++ b/kghostview/scrollbox.cpp @@ -22,8 +22,8 @@ #include "scrollbox.h" -ScrollBox::ScrollBox( TQWidget* tqparent, const char* name ) - : TQFrame( tqparent, name ) +ScrollBox::ScrollBox( TQWidget* parent, const char* name ) + : TQFrame( parent, name ) { setFrameStyle( Panel | Sunken ); } diff --git a/kghostview/scrollbox.h b/kghostview/scrollbox.h index 04722166..f324dc57 100644 --- a/kghostview/scrollbox.h +++ b/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& ); diff --git a/kghostview/thumbnailservice.cpp b/kghostview/thumbnailservice.cpp index 9887ec4b..817d1c03 100644 --- a/kghostview/thumbnailservice.cpp +++ b/kghostview/thumbnailservice.cpp @@ -28,14 +28,14 @@ #include <cassert> #include <cstring> -ThumbnailService::ThumbnailService( KGVMiniWidget* tqparent, const char* name ) : - TQObject( tqparent, name ), - _mini( tqparent ), +ThumbnailService::ThumbnailService( KGVMiniWidget* parent, const char* name ) : + TQObject( parent, name ), + _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() ) ); diff --git a/kghostview/thumbnailservice.h b/kghostview/thumbnailservice.h index e57f18bf..afbffa9f 100644 --- a/kghostview/thumbnailservice.h +++ b/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: diff --git a/kghostview/viewcontrol.cpp b/kghostview/viewcontrol.cpp index 3da5730e..8f1c8f0c 100644 --- a/kghostview/viewcontrol.cpp +++ b/kghostview/viewcontrol.cpp @@ -25,8 +25,8 @@ #include <kbuttonbox.h> #include <kseparator.h> -ViewControl::ViewControl( TQWidget *tqparent, const char *name ) - : TQDialog( tqparent, name ) +ViewControl::ViewControl( TQWidget *parent, const char *name ) + : TQDialog( parent, name ) { setFocusPolicy(TQ_StrongFocus); diff --git a/kghostview/viewcontrol.h b/kghostview/viewcontrol.h index 7f2c07c1..8eac289e 100644 --- a/kghostview/viewcontrol.h +++ b/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; diff --git a/kiconedit/kcolorgrid.cpp b/kiconedit/kcolorgrid.cpp index 837958b8..35fd9f3e 100644 --- a/kiconedit/kcolorgrid.cpp +++ b/kiconedit/kcolorgrid.cpp @@ -69,8 +69,8 @@ uint KColorArray::closestMatch(uint color) return c|OPAQUE_MASK; } -KColorGrid::KColorGrid(TQWidget *tqparent, const char *name, int space) - : TQWidget(tqparent, name, TQt::WResizeNoErase|TQt::WRepaintNoErase) +KColorGrid::KColorGrid(TQWidget *parent, const char *name, int space) + : TQWidget(parent, name, TQt::WResizeNoErase|TQt::WRepaintNoErase) { //kdDebug(4640) << "KColorGrid - constructor" << endl; s = space; diff --git a/kiconedit/kcolorgrid.h b/kiconedit/kcolorgrid.h index 2be09f28..a5e21fc7 100644 --- a/kiconedit/kcolorgrid.h +++ b/kiconedit/kcolorgrid.h @@ -43,7 +43,7 @@ private: Q_OBJECT TQ_OBJECT public: - KColorGrid( TQWidget * tqparent = 0, const char *name = 0, int spacing = 0); + KColorGrid( TQWidget * parent = 0, const char *name = 0, int spacing = 0); virtual ~KColorGrid() {}; enum GridState { Plain, Shaded }; diff --git a/kiconedit/kicon.cpp b/kiconedit/kicon.cpp index f1f31590..f36fde00 100644 --- a/kiconedit/kicon.cpp +++ b/kiconedit/kicon.cpp @@ -32,8 +32,8 @@ #include "kicon.h" #include "utils.h" -KIconEditIcon::KIconEditIcon(TQObject *tqparent, const TQImage *img, KURL url) - : TQObject(tqparent) +KIconEditIcon::KIconEditIcon(TQObject *parent, const TQImage *img, KURL url) + : TQObject(parent) { f = 0; _lastdir = "/"; @@ -71,7 +71,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url) if(!url.isValid()) // Giving up { TQString msg = i18n("The URL: %1 \nseems to be malformed.\n").tqarg(url.url()); - KMessageBox::sorry((TQWidget*)tqparent(), msg); + KMessageBox::sorry((TQWidget*)parent(), msg); return false; } } @@ -84,10 +84,10 @@ bool KIconEditIcon::open(const TQImage *image, KURL url) } else { - if(!KIO::NetAccess::download( url, filename, (TQWidget*)tqparent() )) + if(!KIO::NetAccess::download( url, filename, (TQWidget*)parent() )) { TQString msg = i18n("There was an error loading:\n%1\n").tqarg(url.prettyURL()); - KMessageBox::error((TQWidget*)tqparent(), msg); + KMessageBox::error((TQWidget*)parent(), msg); return false; } } @@ -102,7 +102,7 @@ bool KIconEditIcon::open(const TQImage *image, KURL url) if(!loadedOk) { TQString msg = i18n("There was an error loading:\n%1\n").tqarg(url.prettyURL()); - KMessageBox::error((TQWidget*)tqparent(), msg); + KMessageBox::error((TQWidget*)parent(), msg); } else { @@ -155,7 +155,7 @@ bool KIconEditIcon::promptForFile(const TQImage *img) KURL url = KFileDialog::getOpenURL( TQString(), filter ); */ bool loaded = false; - KURL url = KFileDialog::getImageOpenURL( TQString(), TQT_TQWIDGET(tqparent()) ); + KURL url = KFileDialog::getImageOpenURL( TQString(), TQT_TQWIDGET(parent()) ); if( !url.isEmpty() ) { @@ -174,7 +174,7 @@ bool KIconEditIcon::saveAs(const TQImage *image) TQString file; //Get list of file types.. - KFileDialog *dialog=new KFileDialog(TQString(), TQString(), TQT_TQWIDGET(tqparent()), "file dialog", true); + KFileDialog *dialog=new KFileDialog(TQString(), TQString(), TQT_TQWIDGET(parent()), "file dialog", true); dialog->setCaption( i18n("Save Icon As") ); dialog->setKeepLocation( true ); dialog->setMimeFilter( KImageIO::mimeTypes(KImageIO::Writing), "image/png" ); @@ -206,7 +206,7 @@ bool KIconEditIcon::saveAs(const TQImage *image) if(TQFile::exists(file)) { - int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(tqparent()), + int r=KMessageBox::warningContinueCancel(TQT_TQWIDGET(parent()), i18n( "A file named \"%1\" already exists. " "Overwrite it?" ).tqarg(file), i18n( "Overwrite File?" ), @@ -266,7 +266,7 @@ bool KIconEditIcon::save(const TQImage *image, const TQString &_filename) else { TQString msg = i18n("There was an error saving:\n%1\n").tqarg(str); - KMessageBox::error((TQWidget*)tqparent(), msg); + KMessageBox::error((TQWidget*)parent(), msg); kdDebug(4640) << "KIconEditIcon::save - " << msg << endl; } diff --git a/kiconedit/kiconcolors.cpp b/kiconedit/kiconcolors.cpp index 3bfc872d..4393379b 100644 --- a/kiconedit/kiconcolors.cpp +++ b/kiconedit/kiconcolors.cpp @@ -25,7 +25,7 @@ #include "kiconcolors.h" -KDrawColors::KDrawColors(TQWidget *tqparent) : KColorGrid(tqparent, 0, 3) +KDrawColors::KDrawColors(TQWidget *parent) : KColorGrid(parent, 0, 3) { kdDebug(4640) << "KDrawColors - constructor" << endl; setCellSize(17); @@ -65,7 +65,7 @@ void KDrawColors::mouseReleaseEvent( TQMouseEvent *e ) emit newColor(colorAt(cell)|OPAQUE_MASK); } -KSysColors::KSysColors(TQWidget *tqparent) : KDrawColors(tqparent) +KSysColors::KSysColors(TQWidget *parent) : KDrawColors(parent) { kdDebug(4640) << "KSysColors - constructor" << endl; @@ -85,7 +85,7 @@ KSysColors::KSysColors(TQWidget *tqparent) : KDrawColors(tqparent) kdDebug(4640) << "KSysColors - constructor - done" << endl; } -KCustomColors::KCustomColors(TQWidget *tqparent) : KDrawColors(tqparent) +KCustomColors::KCustomColors(TQWidget *parent) : KDrawColors(parent) { kdDebug(4640) << "KCustomColors - constructor" << endl; setNumRows(3); diff --git a/kiconedit/kiconcolors.h b/kiconedit/kiconcolors.h index 90f07d09..756b84a7 100644 --- a/kiconedit/kiconcolors.h +++ b/kiconedit/kiconcolors.h @@ -33,7 +33,7 @@ class KDrawColors : public KColorGrid Q_OBJECT TQ_OBJECT public: - KDrawColors(TQWidget *tqparent); + KDrawColors(TQWidget *parent); //bool hasColor(uint); @@ -52,7 +52,7 @@ class KCustomColors : public KDrawColors Q_OBJECT TQ_OBJECT public: - KCustomColors(TQWidget *tqparent); + KCustomColors(TQWidget *parent); ~KCustomColors(); void addColor(uint); @@ -74,7 +74,7 @@ class KSysColors : public KDrawColors TQ_OBJECT public: - KSysColors(TQWidget *tqparent); + KSysColors(TQWidget *parent); }; diff --git a/kiconedit/kiconconfig.cpp b/kiconedit/kiconconfig.cpp index e0e223a5..d5db3bde 100644 --- a/kiconedit/kiconconfig.cpp +++ b/kiconedit/kiconconfig.cpp @@ -52,8 +52,8 @@ static inline TQPixmap loadIcon( const char * name ) ->loadIcon( TQString::tqfromLatin1(name), KIcon::NoGroup, KIcon::SizeMedium ); } -KTemplateEditDlg::KTemplateEditDlg(TQWidget *tqparent) - : KDialogBase(tqparent, "KTemplateEditDlg", true, i18n( "Icon Template" ), +KTemplateEditDlg::KTemplateEditDlg(TQWidget *parent) + : KDialogBase(parent, "KTemplateEditDlg", true, i18n( "Icon Template" ), Ok|Cancel ) { TQFrame *frame = makeMainWidget(); @@ -112,7 +112,7 @@ TQString KTemplateEditDlg::path() return ln_path->url(); } -KTemplateConfig::KTemplateConfig(TQWidget *tqparent) : TQWidget(tqparent) +KTemplateConfig::KTemplateConfig(TQWidget *parent) : TQWidget(parent) { kdDebug(4640) << "KTemplateConfig constructor" << endl; @@ -224,8 +224,8 @@ void KTemplateConfig::edit() } } -KBackgroundConfig::KBackgroundConfig( TQWidget* tqparent ) - : TQWidget( tqparent ) +KBackgroundConfig::KBackgroundConfig( TQWidget* parent ) + : TQWidget( parent ) { kdDebug(4640) << "KBackgroundConfig - constructor" << endl; @@ -373,7 +373,7 @@ void KBackgroundConfig::selectPixmap() } } -KMiscConfig::KMiscConfig(TQWidget *tqparent) : TQWidget(tqparent) +KMiscConfig::KMiscConfig(TQWidget *parent) : TQWidget(parent) { kdDebug(4640) << "KMiscConfig - constructor" << endl; @@ -524,14 +524,14 @@ void KMiscConfig::slotTransparencyDisplayType(int id) } } -KIconConfig::KIconConfig(TQWidget *tqparent) +KIconConfig::KIconConfig(TQWidget *parent) : KDialogBase(KDialogBase::IconList, i18n("Configure"), KDialogBase::Help | KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel, KDialogBase::Ok, - tqparent, "configDialog", true, true) + parent, "configDialog", true, true) { setHelp(TQString()); //KWin::setIcons(winId(), kapp->icon(), kapp->miniIcon()); diff --git a/kiconedit/kiconconfig.h b/kiconedit/kiconconfig.h index df143c54..1431c998 100644 --- a/kiconedit/kiconconfig.h +++ b/kiconedit/kiconconfig.h @@ -85,7 +85,7 @@ class KBackgroundConfig : public TQWidget Q_OBJECT TQ_OBJECT public: - KBackgroundConfig(TQWidget *tqparent); + KBackgroundConfig(TQWidget *parent); ~KBackgroundConfig(); public slots: @@ -112,7 +112,7 @@ class KMiscConfig : public TQWidget Q_OBJECT TQ_OBJECT public: - KMiscConfig(TQWidget *tqparent); + KMiscConfig(TQWidget *parent); ~KMiscConfig(); public slots: @@ -141,7 +141,7 @@ class KIconConfig : public KDialogBase public: - KIconConfig(TQWidget *tqparent); + KIconConfig(TQWidget *parent); ~KIconConfig(); protected slots: diff --git a/kiconedit/kiconedit.cpp b/kiconedit/kiconedit.cpp index f6a6c335..8a4a6af1 100644 --- a/kiconedit/kiconedit.cpp +++ b/kiconedit/kiconedit.cpp @@ -451,7 +451,7 @@ void KIconEdit::updateAccels() actionCollection()->readShortcutSettings(); } -TQWidget *KIconEdit::createContainer( TQWidget *tqparent, int index, +TQWidget *KIconEdit::createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id ) { if ( element.attribute( "name" ) == "paletteToolBar" ) @@ -461,7 +461,7 @@ TQWidget *KIconEdit::createContainer( TQWidget *tqparent, int index, return m_paletteToolBar; } - return KXMLGUIBuilder::createContainer( tqparent, index, element, id ); + return KXMLGUIBuilder::createContainer( parent, index, element, id ); } bool KIconEdit::setupStatusBar() diff --git a/kiconedit/kicongrid.cpp b/kiconedit/kicongrid.cpp index b8ed29ab..b24db091 100644 --- a/kiconedit/kicongrid.cpp +++ b/kiconedit/kicongrid.cpp @@ -67,8 +67,8 @@ void RepaintCommand::execute() grid->update( area); } -KGridView::KGridView(TQImage *image, KCommandHistory* history, TQWidget *tqparent, const char *name) -: TQFrame(tqparent, name) +KGridView::KGridView(TQImage *image, KCommandHistory* history, TQWidget *parent, const char *name) +: TQFrame(parent, name) { _corner = 0L; _hruler = _vruler = 0L; @@ -290,8 +290,8 @@ void KGridView::resizeEvent(TQResizeEvent*) } -KIconEditGrid::KIconEditGrid(TQImage *image, KCommandHistory* h, TQWidget *tqparent, const char *name) - : KColorGrid(tqparent, name, 1) +KIconEditGrid::KIconEditGrid(TQImage *image, KCommandHistory* h, TQWidget *parent, const char *name) + : KColorGrid(parent, name, 1) { img = image; history = h; @@ -1426,7 +1426,7 @@ void KIconEditGrid::setSize(const TQSize s) void KIconEditGrid::createCursors() { - TQBitmap tqmask(22, 22); + TQBitmap mask(22, 22); TQPixmap pix; cursor_normal = TQCursor(arrowCursor); @@ -1439,8 +1439,8 @@ void KIconEditGrid::createCursors() } else { - tqmask = TQPixmap(pix.createHeuristicMask()); - pix.setMask(tqmask); + mask = TQPixmap(pix.createHeuristicMask()); + pix.setMask(mask); cursor_colorpicker = TQCursor(pix, 1, 21); } @@ -1452,8 +1452,8 @@ void KIconEditGrid::createCursors() } else { - tqmask = TQPixmap(pix.createHeuristicMask()); - pix.setMask(tqmask); + mask = TQPixmap(pix.createHeuristicMask()); + pix.setMask(mask); cursor_paint = TQCursor(pix, 0, 19); } @@ -1465,8 +1465,8 @@ void KIconEditGrid::createCursors() } else { - tqmask = TQPixmap(pix.createHeuristicMask()); - pix.setMask(tqmask); + mask = TQPixmap(pix.createHeuristicMask()); + pix.setMask(mask); cursor_flood = TQCursor(pix, 3, 20); } @@ -1478,8 +1478,8 @@ void KIconEditGrid::createCursors() } else { - tqmask = TQPixmap(pix.createHeuristicMask()); - pix.setMask(tqmask); + mask = TQPixmap(pix.createHeuristicMask()); + pix.setMask(mask); cursor_aim = TQCursor(pix, 10, 10); } @@ -1491,8 +1491,8 @@ void KIconEditGrid::createCursors() } else { - tqmask = TQPixmap(pix.createHeuristicMask(true)); - pix.setMask(tqmask); + mask = TQPixmap(pix.createHeuristicMask(true)); + pix.setMask(mask); cursor_spray = TQCursor(pix, 0, 20); } @@ -1504,8 +1504,8 @@ void KIconEditGrid::createCursors() } else { - tqmask = TQPixmap(pix.createHeuristicMask(true)); - pix.setMask(tqmask); + mask = TQPixmap(pix.createHeuristicMask(true)); + pix.setMask(mask); cursor_erase = TQCursor(pix, 1, 16); } } diff --git a/kiconedit/kicongrid.h b/kiconedit/kicongrid.h index 10e75a6f..e87ae69a 100644 --- a/kiconedit/kicongrid.h +++ b/kiconedit/kicongrid.h @@ -92,7 +92,7 @@ class KGridView : public TQFrame Q_OBJECT TQ_OBJECT public: - KGridView( TQImage *image, KCommandHistory* history, TQWidget * tqparent = 0, const char *name = 0); + KGridView( TQImage *image, KCommandHistory* history, TQWidget * parent = 0, const char *name = 0); KRuler *hruler() { return _hruler;} KRuler *vruler() { return _vruler;} @@ -134,7 +134,7 @@ class KIconEditGrid : public KColorGrid Q_OBJECT TQ_OBJECT public: - KIconEditGrid( TQImage *image, KCommandHistory* h, TQWidget * tqparent = 0, const char *name = 0); + KIconEditGrid( TQImage *image, KCommandHistory* h, TQWidget * parent = 0, const char *name = 0); virtual ~KIconEditGrid(); enum DrawTool { Line, Freehand, FloodFill, Spray, Rect, FilledRect, Circle, diff --git a/kiconedit/knew.cpp b/kiconedit/knew.cpp index b611a624..e38d58bb 100644 --- a/kiconedit/knew.cpp +++ b/kiconedit/knew.cpp @@ -153,9 +153,9 @@ int KIconListBoxItem::width(const TQListBox *lb ) const return pm.width() + lb->fontMetrics().width( text() ) + 6; } -NewSelect::NewSelect(TQWidget *tqparent) : TQWidget( tqparent ) +NewSelect::NewSelect(TQWidget *parent) : TQWidget( parent ) { - wiz = (KWizard*) tqparent; + wiz = (KWizard*) parent; grp = new TQButtonGroup( this ); connect( grp, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( buttonClicked( int ) ) ); grp->setExclusive( true ); @@ -189,10 +189,10 @@ void NewSelect::buttonClicked(int id) emit iconopenstyle(id); } -NewFromTemplate::NewFromTemplate( TQWidget* tqparent ) - : TQWidget( tqparent ) +NewFromTemplate::NewFromTemplate( TQWidget* parent ) + : TQWidget( parent ) { - wiz = (KWizard*) tqparent; + wiz = (KWizard*) parent; TQVBoxLayout* ml = new TQVBoxLayout(this); @@ -223,8 +223,8 @@ void NewFromTemplate::checkSelection( int ) wiz->finishButton()->setEnabled( false ); } -KNewIcon::KNewIcon( TQWidget* tqparent ) - : KWizard( tqparent, 0, true ) +KNewIcon::KNewIcon( TQWidget* parent ) + : KWizard( parent, 0, true ) { //kdDebug(4640) << "KNewIcon" << endl; setCaption( i18n( "Create New Icon" ) ); diff --git a/kiconedit/knew.h b/kiconedit/knew.h index 4bfb7086..12aa639e 100644 --- a/kiconedit/knew.h +++ b/kiconedit/knew.h @@ -66,7 +66,7 @@ class KIconListBox : public TQListBox Q_OBJECT TQ_OBJECT public: - KIconListBox( TQWidget *tqparent ) : TQListBox(tqparent) {} ; + KIconListBox( TQWidget *parent ) : TQListBox(parent) {} ; const TQString path(int idx) { return ((KIconListBoxItem*)item(idx))->path(); } KIconTemplate& iconTemplate(int idx) { return ((KIconListBoxItem*)item(idx))->iconTemplate(); } @@ -99,7 +99,7 @@ class NewSelect : public TQWidget Q_OBJECT TQ_OBJECT public: - NewSelect(TQWidget *tqparent); + NewSelect(TQWidget *parent); ~NewSelect(); signals: @@ -119,7 +119,7 @@ class NewFromTemplate : public TQWidget Q_OBJECT TQ_OBJECT public: - NewFromTemplate(TQWidget *tqparent); + NewFromTemplate(TQWidget *parent); ~NewFromTemplate(); const TQString path() { return TQString(templates->path(templates->currentItem())); } @@ -138,7 +138,7 @@ class KNewIcon : public KWizard Q_OBJECT TQ_OBJECT public: - KNewIcon(TQWidget *tqparent); + KNewIcon(TQWidget *parent); ~KNewIcon(); enum { Blank = 0, Template = 1}; diff --git a/kiconedit/kresize.cpp b/kiconedit/kresize.cpp index b290cce7..ac98e214 100644 --- a/kiconedit/kresize.cpp +++ b/kiconedit/kresize.cpp @@ -28,8 +28,8 @@ #include "kresize.h" -KResizeWidget::KResizeWidget( TQWidget* tqparent, const char* name, - const TQSize& size ) : TQWidget( tqparent, name ) +KResizeWidget::KResizeWidget( TQWidget* parent, const char* name, + const TQSize& size ) : TQWidget( parent, name ) { TQHBoxLayout* genLayout = new TQHBoxLayout( this ); @@ -62,9 +62,9 @@ const TQSize KResizeWidget::getSize() return TQSize( m_width->value(), m_height->value() ); } -KResizeDialog::KResizeDialog( TQWidget* tqparent, const char* name, +KResizeDialog::KResizeDialog( TQWidget* parent, const char* name, const TQSize size ) - : KDialogBase( tqparent, name, true, i18n( "Select Size" ), Ok|Cancel ) + : KDialogBase( parent, name, true, i18n( "Select Size" ), Ok|Cancel ) { m_resize = new KResizeWidget( this, "resize widget", size ); diff --git a/kiconedit/kresize.h b/kiconedit/kresize.h index 37158ed3..c0d2574e 100644 --- a/kiconedit/kresize.h +++ b/kiconedit/kresize.h @@ -33,7 +33,7 @@ class KResizeWidget : public TQWidget public: - KResizeWidget( TQWidget* tqparent, const char* name, const TQSize& ); + KResizeWidget( TQWidget* parent, const char* name, const TQSize& ); ~KResizeWidget(); const TQSize getSize(); @@ -51,7 +51,7 @@ class KResizeDialog : public KDialogBase public: - KResizeDialog( TQWidget* tqparent, const char* name, const TQSize s ); + KResizeDialog( TQWidget* parent, const char* name, const TQSize s ); ~KResizeDialog(); const TQSize getSize(); diff --git a/kiconedit/palettetoolbar.cpp b/kiconedit/palettetoolbar.cpp index abd48737..225e2439 100644 --- a/kiconedit/palettetoolbar.cpp +++ b/kiconedit/palettetoolbar.cpp @@ -30,8 +30,8 @@ #include "kiconcolors.h" #include "palettetoolbar.h" -PaletteToolBar::PaletteToolBar( TQWidget *tqparent, const char *name ) - : KToolBar( tqparent, name ) +PaletteToolBar::PaletteToolBar( TQWidget *parent, const char *name ) + : KToolBar( parent, name ) { TQWidget *base = new TQWidget( this ); diff --git a/kiconedit/palettetoolbar.h b/kiconedit/palettetoolbar.h index 0e53914e..3c0cc329 100644 --- a/kiconedit/palettetoolbar.h +++ b/kiconedit/palettetoolbar.h @@ -35,7 +35,7 @@ class PaletteToolBar : public KToolBar TQ_OBJECT public: - PaletteToolBar( TQWidget *tqparent, const char *name = 0L ); + PaletteToolBar( TQWidget *parent, const char *name = 0L ); signals: void newColor( uint c ); diff --git a/kmrml/kmrml/algorithmcombo.cpp b/kmrml/kmrml/algorithmcombo.cpp index bdd56ca3..2a2d4a3b 100644 --- a/kmrml/kmrml/algorithmcombo.cpp +++ b/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 ) - : KComboBox( false, tqparent, name ), +AlgorithmCombo::AlgorithmCombo( TQWidget *parent, const char *name ) + : KComboBox( false, parent, name ), m_algorithms( 0L ) { connect( this, TQT_SIGNAL( activated( const TQString& ) ), diff --git a/kmrml/kmrml/algorithmcombo.h b/kmrml/kmrml/algorithmcombo.h index 082780b4..1a4f8dde 100644 --- a/kmrml/kmrml/algorithmcombo.h +++ b/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 ); diff --git a/kmrml/kmrml/algorithmdialog.cpp b/kmrml/kmrml/algorithmdialog.cpp index 60926b1e..68060bb3 100644 --- a/kmrml/kmrml/algorithmdialog.cpp +++ b/kmrml/kmrml/algorithmdialog.cpp @@ -34,8 +34,8 @@ using namespace KMrml; class ScrollView : public TQScrollView { public: - ScrollView(TQWidget* tqparent = 0, const char* name = 0) - : TQScrollView(tqparent, name) + ScrollView(TQWidget* parent = 0, const char* name = 0) + : 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 ) - : KDialogBase( tqparent, name, false, i18n("Configure Query Algorithms"), + TQWidget *parent, const char *name ) + : KDialogBase( parent, name, false, i18n("Configure Query Algorithms"), Ok | Cancel, Ok, false ), m_allAlgorithms( algorithms ), m_collections( collections ) diff --git a/kmrml/kmrml/algorithmdialog.h b/kmrml/kmrml/algorithmdialog.h index f5e02116..8e0f56a5 100644 --- a/kmrml/kmrml/algorithmdialog.h +++ b/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: diff --git a/kmrml/kmrml/browser.cpp b/kmrml/kmrml/browser.cpp index 7603debb..57ac0085 100644 --- a/kmrml/kmrml/browser.cpp +++ b/kmrml/kmrml/browser.cpp @@ -23,9 +23,9 @@ using namespace KMrml; -Browser::Browser( MrmlPart *tqparent, const char *name ) - : KParts::BrowserExtension( tqparent, name ), - m_part( tqparent ) +Browser::Browser( MrmlPart *parent, const char *name ) + : KParts::BrowserExtension( parent, name ), + m_part( parent ) { } diff --git a/kmrml/kmrml/browser.h b/kmrml/kmrml/browser.h index c30e148c..47979fea 100644 --- a/kmrml/kmrml/browser.h +++ b/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 ); diff --git a/kmrml/kmrml/collectioncombo.cpp b/kmrml/kmrml/collectioncombo.cpp index d71a1c2a..7238305e 100644 --- a/kmrml/kmrml/collectioncombo.cpp +++ b/kmrml/kmrml/collectioncombo.cpp @@ -22,8 +22,8 @@ using namespace KMrml; -CollectionCombo::CollectionCombo( TQWidget *tqparent, const char *name ) - : KComboBox( false, tqparent, name ), +CollectionCombo::CollectionCombo( TQWidget *parent, const char *name ) + : KComboBox( false, parent, name ), m_collections( 0L ) { connect( this, TQT_SIGNAL( activated( const TQString& ) ), diff --git a/kmrml/kmrml/collectioncombo.h b/kmrml/kmrml/collectioncombo.h index dc7722d4..746c0a86 100644 --- a/kmrml/kmrml/collectioncombo.h +++ b/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 ); diff --git a/kmrml/kmrml/kcontrol/indexcleaner.cpp b/kmrml/kmrml/kcontrol/indexcleaner.cpp index 18d5205e..3c09b7a3 100644 --- a/kmrml/kmrml/kcontrol/indexcleaner.cpp +++ b/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( tqparent, name ), + TQObject *parent, const char *name ) + : TQObject( parent, name ), m_dirs( dirs ), m_config( config ), m_process( 0L ) diff --git a/kmrml/kmrml/kcontrol/indexcleaner.h b/kmrml/kmrml/kcontrol/indexcleaner.h index afc2ebfd..a9d4e6c1 100644 --- a/kmrml/kmrml/kcontrol/indexcleaner.h +++ b/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(); diff --git a/kmrml/kmrml/kcontrol/indexer.cpp b/kmrml/kmrml/kcontrol/indexer.cpp index 14c6a5c5..78e83f76 100644 --- a/kmrml/kmrml/kcontrol/indexer.cpp +++ b/kmrml/kmrml/kcontrol/indexer.cpp @@ -36,8 +36,8 @@ using namespace KMrmlConfig; Indexer::Indexer( const KMrml::Config* config, - TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ), + TQObject *parent, const char *name ) + : TQObject( parent, name ), m_config( config ), m_dirCount( 0 ) { diff --git a/kmrml/kmrml/kcontrol/indexer.h b/kmrml/kmrml/kcontrol/indexer.h index d9fede24..3fd97da9 100644 --- a/kmrml/kmrml/kcontrol/indexer.h +++ b/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 ); diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.cpp b/kmrml/kmrml/kcontrol/kcmkmrml.cpp index 3bff026a..42aaf534 100644 --- a/kmrml/kmrml/kcontrol/kcmkmrml.cpp +++ b/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 & ): - KCModule(MrmlFactory::instance(), tqparent, name) +KCMKMrml::KCMKMrml(TQWidget *parent, const char *name, const TQStringList & ): + KCModule(MrmlFactory::instance(), parent, name) { KAboutData* ab = new KAboutData( "kcmkmrml", diff --git a/kmrml/kmrml/kcontrol/kcmkmrml.h b/kmrml/kmrml/kcontrol/kcmkmrml.h index 1c15a0a2..583689e7 100644 --- a/kmrml/kmrml/kcontrol/kcmkmrml.h +++ b/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(); diff --git a/kmrml/kmrml/kcontrol/mainpage.cpp b/kmrml/kmrml/kcontrol/mainpage.cpp index 90756bfb..c44f1b0e 100644 --- a/kmrml/kmrml/kcontrol/mainpage.cpp +++ b/kmrml/kmrml/kcontrol/mainpage.cpp @@ -50,8 +50,8 @@ using namespace KMrmlConfig; -MainPage::MainPage( TQWidget *tqparent, const char *name ) - : TQVBox( tqparent, name ), +MainPage::MainPage( TQWidget *parent, const char *name ) + : TQVBox( parent, name ), m_indexer( 0L ), m_indexCleaner( 0L ), m_progressDialog( 0L ), diff --git a/kmrml/kmrml/kcontrol/mainpage.h b/kmrml/kmrml/kcontrol/mainpage.h index 7a7d6902..82510fc9 100644 --- a/kmrml/kmrml/kcontrol/mainpage.h +++ b/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(); diff --git a/kmrml/kmrml/mrml_creator.cpp b/kmrml/kmrml/mrml_creator.cpp index 03f2ef77..fe4a14c6 100644 --- a/kmrml/kmrml/mrml_creator.cpp +++ b/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 ); } diff --git a/kmrml/kmrml/mrml_creator.h b/kmrml/kmrml/mrml_creator.h index 2c9e33c3..b1037558 100644 --- a/kmrml/kmrml/mrml_creator.h +++ b/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 ); } diff --git a/kmrml/kmrml/mrml_elements.cpp b/kmrml/kmrml/mrml_elements.cpp index ae7ddeee..8700ed43 100644 --- a/kmrml/kmrml/mrml_elements.cpp +++ b/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 ) diff --git a/kmrml/kmrml/mrml_elements.h b/kmrml/kmrml/mrml_elements.h index ae66dcab..6fe6767d 100644 --- a/kmrml/kmrml/mrml_elements.h +++ b/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 ); diff --git a/kmrml/kmrml/mrml_part.cpp b/kmrml/kmrml/mrml_part.cpp index 032eafe6..c35e6607 100644 --- a/kmrml/kmrml/mrml_part.cpp +++ b/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 ) { diff --git a/kmrml/kmrml/mrml_part.h b/kmrml/kmrml/mrml_part.h index 8b2d4cdd..1451b833 100644 --- a/kmrml/kmrml/mrml_part.h +++ b/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() ); diff --git a/kmrml/kmrml/mrml_view.cpp b/kmrml/kmrml/mrml_view.cpp index 5874c996..d5b26117 100644 --- a/kmrml/kmrml/mrml_view.cpp +++ b/kmrml/kmrml/mrml_view.cpp @@ -37,8 +37,8 @@ using namespace KMrml; -MrmlView::MrmlView( TQWidget *tqparent, const char *name ) - : TQScrollView( tqparent, name ) +MrmlView::MrmlView( TQWidget *parent, const char *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 ); } diff --git a/kmrml/kmrml/mrml_view.h b/kmrml/kmrml/mrml_view.h index d666910f..a9f1aad1 100644 --- a/kmrml/kmrml/mrml_view.h +++ b/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; } diff --git a/kmrml/kmrml/propertysheet.cpp b/kmrml/kmrml/propertysheet.cpp index 6391c62e..dba9d531 100644 --- a/kmrml/kmrml/propertysheet.cpp +++ b/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; diff --git a/kmrml/kmrml/propertysheet.h b/kmrml/kmrml/propertysheet.h index 89d9a37f..2e20cb85 100644 --- a/kmrml/kmrml/propertysheet.h +++ b/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 ); diff --git a/kmrml/kmrml/propertywidgets.cpp b/kmrml/kmrml/propertywidgets.cpp index 5c562588..18508f3a 100644 --- a/kmrml/kmrml/propertywidgets.cpp +++ b/kmrml/kmrml/propertywidgets.cpp @@ -19,8 +19,8 @@ #include "propertywidgets.h" IntegerWidget::IntegerWidget( const PropertySheet& sheet, - TQWidget *tqparent, const char *name ) - : TQHBox( tqparent, name ) + TQWidget *parent, const char *name ) + : TQHBox( parent, name ) { } @@ -39,8 +39,8 @@ int IntegerWidget::value() const /////////////////////////////////////////////////////////////////// ComboWidget::ComboWidget( const PropertySheet& sheet, - TQWidget *tqparent, const char *name ) - : TQHBox( tqparent, name ) + TQWidget *parent, const char *name ) + : TQHBox( parent, name ) { } @@ -60,8 +60,8 @@ TQString ComboWidget::value() const /////////////////////////////////////////////////////////////////// CheckBoxWidget::CheckBoxWidget( const PropertySheet& sheet, - TQWidget *tqparent, const char *name ) - : TQHBox( tqparent, name ) + TQWidget *parent, const char *name ) + : TQHBox( parent, name ) { } @@ -81,8 +81,8 @@ bool CheckBoxWidget::value() const /////////////////////////////////////////////////////////////////// LineEditWidget::LineEditWidget( const PropertySheet& sheet, - TQWidget *tqparent, const char *name ) - : TQHBox( tqparent, name ) + TQWidget *parent, const char *name ) + : TQHBox( parent, name ) { } @@ -102,8 +102,8 @@ TQString LineEditWidget::value() const /////////////////////////////////////////////////////////////////// ListBoxWidget::ListBoxWidget( const PropertySheet& sheet, - TQWidget *tqparent, const char *name ) - : TQHBox( tqparent, name ) + TQWidget *parent, const char *name ) + : TQHBox( parent, name ) { } diff --git a/kmrml/kmrml/propertywidgets.h b/kmrml/kmrml/propertywidgets.h index 1048e6f0..d0987c0b 100644 --- a/kmrml/kmrml/propertywidgets.h +++ b/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(); diff --git a/kolourpaint/kpcommandhistory.cpp b/kolourpaint/kpcommandhistory.cpp index d92c43e6..06948815 100644 --- a/kolourpaint/kpcommandhistory.cpp +++ b/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 (); diff --git a/kolourpaint/kpdocument.cpp b/kolourpaint/kpdocument.cpp index 9b7d5936..fe91bfee 100644 --- a/kolourpaint/kpdocument.cpp +++ b/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 ()) - erasePixmap.setMask (*selTransparentPixmap.tqmask ()); + if (selTransparentPixmap.mask ()) + erasePixmap.setMask (*selTransparentPixmap.mask ()); paintPixmapAt (erasePixmap, boundingRect.topLeft ()); } diff --git a/kolourpaint/kpdocument.h b/kolourpaint/kpdocument.h index 67ce32f3..b2dfb55b 100644 --- a/kolourpaint/kpdocument.h +++ b/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, diff --git a/kolourpaint/kpdocumentsaveoptions.cpp b/kolourpaint/kpdocumentsaveoptions.cpp index 89eaf2d8..c217cffb 100644 --- a/kolourpaint/kpdocumentsaveoptions.cpp +++ b/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; } diff --git a/kolourpaint/kpdocumentsaveoptions.h b/kolourpaint/kpdocumentsaveoptions.h index 22feaaa9..d6279885 100644 --- a/kolourpaint/kpdocumentsaveoptions.h +++ b/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 diff --git a/kolourpaint/kpdocumentsaveoptionswidget.cpp b/kolourpaint/kpdocumentsaveoptionswidget.cpp index 4309fbf1..372743af 100644 --- a/kolourpaint/kpdocumentsaveoptionswidget.cpp +++ b/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 (tqparent, name), - m_visualParent (tqparent) + TQWidget *parent, const char *name) + : TQWidget (parent, name), + m_visualParent (parent) { init (); setDocumentSaveOptions (saveOptions); @@ -281,9 +281,9 @@ kpDocumentSaveOptionsWidget::kpDocumentSaveOptionsWidget ( } kpDocumentSaveOptionsWidget::kpDocumentSaveOptionsWidget ( - TQWidget *tqparent, const char *name) - : TQWidget (tqparent, name), - m_visualParent (tqparent) + TQWidget *parent, const char *name) + : TQWidget (parent, name), + m_visualParent (parent) { init (); } diff --git a/kolourpaint/kpdocumentsaveoptionswidget.h b/kolourpaint/kpdocumentsaveoptionswidget.h index 49d4bc20..3266582f 100644 --- a/kolourpaint/kpdocumentsaveoptionswidget.h +++ b/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); - kpDocumentSaveOptionsWidget (TQWidget *tqparent, const char *name = 0); + TQWidget *parent, const char *name = 0); + kpDocumentSaveOptionsWidget (TQWidget *parent, const char *name = 0); private: void init (); public: diff --git a/kolourpaint/kpmainwindow.cpp b/kolourpaint/kpmainwindow.cpp index 34d9d998..3b117803 100644 --- a/kolourpaint/kpmainwindow.cpp +++ b/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 (); diff --git a/kolourpaint/kpmainwindow_edit.cpp b/kolourpaint/kpmainwindow_edit.cpp index 103b6e11..e5156148 100644 --- a/kolourpaint/kpmainwindow_edit.cpp +++ b/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 ( diff --git a/kolourpaint/kpmainwindow_file.cpp b/kolourpaint/kpmainwindow_file.cpp index bcc1c1c4..5e57237b 100644 --- a/kolourpaint/kpmainwindow_file.cpp +++ b/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*/); diff --git a/kolourpaint/kpmainwindow_settings.cpp b/kolourpaint/kpmainwindow_settings.cpp index c9ce8b74..9fc82440 100644 --- a/kolourpaint/kpmainwindow_settings.cpp +++ b/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); diff --git a/kolourpaint/kpselection.cpp b/kolourpaint/kpselection.cpp index 65c2e0f3..43f81984 100644 --- a/kolourpaint/kpselection.cpp +++ b/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); } diff --git a/kolourpaint/kpsinglekeytriggersaction.cpp b/kolourpaint/kpsinglekeytriggersaction.cpp index 54e083c7..07573bf4 100644 --- a/kolourpaint/kpsinglekeytriggersaction.cpp +++ b/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) - : KAction (text, shortcut, receiver, slot, tqparent, name) + KActionCollection *parent, const char *name) + : KAction (text, shortcut, receiver, slot, parent, name) { } diff --git a/kolourpaint/kpsinglekeytriggersaction.h b/kolourpaint/kpsinglekeytriggersaction.h index 7b7001ff..495e336e 100644 --- a/kolourpaint/kpsinglekeytriggersaction.h +++ b/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 (); diff --git a/kolourpaint/kptemppixmap.h b/kolourpaint/kptemppixmap.h index e66d622e..2bd9d7bc 100644 --- a/kolourpaint/kptemppixmap.h +++ b/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; /* diff --git a/kolourpaint/kpthumbnail.cpp b/kolourpaint/kpthumbnail.cpp index 58b0b48f..84923c1d 100644 --- a/kolourpaint/kpthumbnail.cpp +++ b/kolourpaint/kpthumbnail.cpp @@ -45,21 +45,21 @@ // TODO: get out of the Alt+Tab list -kpThumbnail::kpThumbnail (kpMainWindow *tqparent, const char *name) - : TQDockWindow (TQDockWindow::OutsideDock, tqparent, name), - m_mainWindow (tqparent), +kpThumbnail::kpThumbnail (kpMainWindow *parent, const char *name) + : TQDockWindow (TQDockWindow::OutsideDock, parent, name), + m_mainWindow (parent), m_view (0) { - if (!tqparent) - kdError () << "kpThumbnail::kpThumbnail() requires tqparent" << endl; + if (!parent) + kdError () << "kpThumbnail::kpThumbnail() requires parent" << endl; - if (tqparent) + if (parent) { // Prevent thumbnail from docking - it's _really_ irritating otherwise - tqparent->leftDock ()->setAcceptDockWindow (this, false); - tqparent->rightDock ()->setAcceptDockWindow (this, false); - tqparent->topDock ()->setAcceptDockWindow (this, false); - tqparent->bottomDock ()->setAcceptDockWindow (this, false); + parent->leftDock ()->setAcceptDockWindow (this, false); + parent->rightDock ()->setAcceptDockWindow (this, false); + parent->topDock ()->setAcceptDockWindow (this, false); + parent->bottomDock ()->setAcceptDockWindow (this, false); } diff --git a/kolourpaint/kpthumbnail.h b/kolourpaint/kpthumbnail.h index 1bb97ff3..5cb17d54 100644 --- a/kolourpaint/kpthumbnail.h +++ b/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: diff --git a/kolourpaint/kptool.cpp b/kolourpaint/kptool.cpp index 7c6a057b..da240492 100644 --- a/kolourpaint/kptool.cpp +++ b/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, diff --git a/kolourpaint/kptool.h b/kolourpaint/kptool.h index 1094b8d1..03bedb0a 100644 --- a/kolourpaint/kptool.h +++ b/kolourpaint/kptool.h @@ -410,7 +410,7 @@ public: const TQString &text, const TQString &caption, const TQString &continueButtonText, - TQWidget *tqparent); + TQWidget *parent); protected: diff --git a/kolourpaint/kpview.cpp b/kolourpaint/kpview.cpp index 12a39fb0..5b68a7b2 100644 --- a/kolourpaint/kpview.cpp +++ b/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 } diff --git a/kolourpaint/kpview.h b/kolourpaint/kpview.h index 613cafd2..4460a8ac 100644 --- a/kolourpaint/kpview.h +++ b/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. diff --git a/kolourpaint/kpviewscrollablecontainer.cpp b/kolourpaint/kpviewscrollablecontainer.cpp index 7cfddb1a..e8ea5a5d 100644 --- a/kolourpaint/kpviewscrollablecontainer.cpp +++ b/kolourpaint/kpviewscrollablecontainer.cpp @@ -58,8 +58,8 @@ static const int GripHandleSize = 7; kpGrip::kpGrip (GripType type, - TQWidget *tqparent, const char *name) - : TQWidget (tqparent, name), + TQWidget *parent, const char *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 ()) - setMask (*pixmap.tqmask ()); + if (pixmap.mask ()) + 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), - m_mainWindow (tqparent), + : TQScrollView ((TQWidget *) parent, name, TQt::WStaticContents | TQt::WNoAutoErase), + m_mainWindow (parent), m_contentsXSoon (-1), m_contentsYSoon (-1), m_view (0), m_bottomGrip (new kpGrip (kpGrip::Bottom, viewport (), "Bottom Grip")), diff --git a/kolourpaint/kpviewscrollablecontainer.h b/kolourpaint/kpviewscrollablecontainer.h index a41b85dd..9b3a5f25 100644 --- a/kolourpaint/kpviewscrollablecontainer.h +++ b/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 diff --git a/kolourpaint/pixmapfx/kpcoloreffect.cpp b/kolourpaint/pixmapfx/kpcoloreffect.cpp index 9b8262dd..85ba5927 100644 --- a/kolourpaint/pixmapfx/kpcoloreffect.cpp +++ b/kolourpaint/pixmapfx/kpcoloreffect.cpp @@ -133,8 +133,8 @@ void kpColorEffectCommand::unexecute () kpColorEffectWidget::kpColorEffectWidget (bool actOnSelection, kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name) - : TQWidget (tqparent, name), + TQWidget *parent, const char *name) + : TQWidget (parent, name), m_actOnSelection (actOnSelection), m_mainWindow (mainWindow) { diff --git a/kolourpaint/pixmapfx/kpcoloreffect.h b/kolourpaint/pixmapfx/kpcoloreffect.h index 1286e794..5221757c 100644 --- a/kolourpaint/pixmapfx/kpcoloreffect.h +++ b/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: diff --git a/kolourpaint/pixmapfx/kpeffectbalance.cpp b/kolourpaint/pixmapfx/kpeffectbalance.cpp index 8f07a26e..946814d5 100644 --- a/kolourpaint/pixmapfx/kpeffectbalance.cpp +++ b/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) - : kpColorEffectWidget (actOnSelection, mainWindow, tqparent, name) + TQWidget *parent, const char *name) + : kpColorEffectWidget (actOnSelection, mainWindow, parent, name) { TQGridLayout *lay = new TQGridLayout (this, 5, 5, marginHint (), spacingHint ()); diff --git a/kolourpaint/pixmapfx/kpeffectbalance.h b/kolourpaint/pixmapfx/kpeffectbalance.h index f44004a2..ec065ee3 100644 --- a/kolourpaint/pixmapfx/kpeffectbalance.h +++ b/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; diff --git a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp b/kolourpaint/pixmapfx/kpeffectblursharpen.cpp index 145ed78c..e1feaaa3 100644 --- a/kolourpaint/pixmapfx/kpeffectblursharpen.cpp +++ b/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 - if (usePixmap.tqmask ()) - retPixmap.setMask (*usePixmap.tqmask ()); + // KImageEffect::(blur|sharpen)() nukes mask - restore it + if (usePixmap.mask ()) + 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) - : kpColorEffectWidget (actOnSelection, mainWindow, tqparent, name) + TQWidget *parent, const char *name) + : kpColorEffectWidget (actOnSelection, mainWindow, parent, name) { TQGridLayout *lay = new TQGridLayout (this, 4, 2, marginHint (), spacingHint ()); diff --git a/kolourpaint/pixmapfx/kpeffectblursharpen.h b/kolourpaint/pixmapfx/kpeffectblursharpen.h index e4db5f86..09c5ee4c 100644 --- a/kolourpaint/pixmapfx/kpeffectblursharpen.h +++ b/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; diff --git a/kolourpaint/pixmapfx/kpeffectemboss.cpp b/kolourpaint/pixmapfx/kpeffectemboss.cpp index 647794db..0783021d 100644 --- a/kolourpaint/pixmapfx/kpeffectemboss.cpp +++ b/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 - if (usePixmap.tqmask ()) - retPixmap.setMask (*usePixmap.tqmask ()); + // KImageEffect::emboss() nukes mask - restore it + if (usePixmap.mask ()) + 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) - : kpColorEffectWidget (actOnSelection, mainWindow, tqparent, name) + TQWidget *parent, const char *name) + : kpColorEffectWidget (actOnSelection, mainWindow, parent, name) { TQGridLayout *lay = new TQGridLayout (this, 4, 2, marginHint (), spacingHint ()); diff --git a/kolourpaint/pixmapfx/kpeffectemboss.h b/kolourpaint/pixmapfx/kpeffectemboss.h index 215a3cfa..18e4584a 100644 --- a/kolourpaint/pixmapfx/kpeffectemboss.h +++ b/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; diff --git a/kolourpaint/pixmapfx/kpeffectflatten.cpp b/kolourpaint/pixmapfx/kpeffectflatten.cpp index 4357e086..1768aa96 100644 --- a/kolourpaint/pixmapfx/kpeffectflatten.cpp +++ b/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 ()) { diff --git a/kolourpaint/pixmapfx/kpeffectflatten.h b/kolourpaint/pixmapfx/kpeffectflatten.h index 4bdf34d4..6eb6b07c 100644 --- a/kolourpaint/pixmapfx/kpeffectflatten.h +++ b/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 (); diff --git a/kolourpaint/pixmapfx/kpeffectinvert.cpp b/kolourpaint/pixmapfx/kpeffectinvert.cpp index aaf2c5d7..ad05d013 100644 --- a/kolourpaint/pixmapfx/kpeffectinvert.cpp +++ b/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 ()); diff --git a/kolourpaint/pixmapfx/kpeffectinvert.h b/kolourpaint/pixmapfx/kpeffectinvert.h index 67277ac3..91be0fae 100644 --- a/kolourpaint/pixmapfx/kpeffectinvert.h +++ b/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 (); diff --git a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp b/kolourpaint/pixmapfx/kpeffectreducecolors.cpp index c89685da..83dd997d 100644 --- a/kolourpaint/pixmapfx/kpeffectreducecolors.cpp +++ b/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 ()) - pixmap.setMask (*destPixmapPtr->tqmask ()); + if (destPixmapPtr->mask ()) + 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 ()); diff --git a/kolourpaint/pixmapfx/kpeffectreducecolors.h b/kolourpaint/pixmapfx/kpeffectreducecolors.h index df4c0bc0..2109c8ca 100644 --- a/kolourpaint/pixmapfx/kpeffectreducecolors.h +++ b/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 (); diff --git a/kolourpaint/pixmapfx/kpeffectsdialog.cpp b/kolourpaint/pixmapfx/kpeffectsdialog.cpp index 80a242c3..098e0396 100644 --- a/kolourpaint/pixmapfx/kpeffectsdialog.cpp +++ b/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), diff --git a/kolourpaint/pixmapfx/kpeffectsdialog.h b/kolourpaint/pixmapfx/kpeffectsdialog.h index ddb3f8c2..94c4ebdc 100644 --- a/kolourpaint/pixmapfx/kpeffectsdialog.h +++ b/kolourpaint/pixmapfx/kpeffectsdialog.h @@ -52,7 +52,7 @@ Q_OBJECT public: kpEffectsDialog (bool actOnSelection, - kpMainWindow *tqparent, + kpMainWindow *parent, const char *name = 0); virtual ~kpEffectsDialog (); diff --git a/kolourpaint/pixmapfx/kpfloodfill.cpp b/kolourpaint/pixmapfx/kpfloodfill.cpp index 2b509cb1..3eef76c3 100644 --- a/kolourpaint/pixmapfx/kpfloodfill.cpp +++ b/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); diff --git a/kolourpaint/pixmapfx/kppixmapfx.cpp b/kolourpaint/pixmapfx/kppixmapfx.cpp index e46f91cb..5b281606 100644 --- a/kolourpaint/pixmapfx/kppixmapfx.cpp +++ b/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); - bitBlt (TQT_TQPAINTDEVICE(&tqmask), + TQBitmap mask = getNonNullMask (*destPixmapPtr); + 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*/); - destPixmapPtr->setMask (tqmask); + true/*ignore mask*/); + 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 ()) - return *pm.tqmask (); + if (pm.mask ()) + 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 ()); diff --git a/kolourpaint/pixmapfx/kppixmapfx.h b/kolourpaint/pixmapfx/kppixmapfx.h index 72882839..e8758fc7 100644 --- a/kolourpaint/pixmapfx/kppixmapfx.h +++ b/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) - // if <pm> does not have a tqmask. + // Returns <pm>'s mask or a fully opaque mask (with <pm>'s dimensions) + // 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. // diff --git a/kolourpaint/tools/kptoolaction.cpp b/kolourpaint/tools/kptoolaction.cpp index 269fd0d0..d45acb30 100644 --- a/kolourpaint/tools/kptoolaction.cpp +++ b/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 (); } diff --git a/kolourpaint/tools/kptoolaction.h b/kolourpaint/tools/kptoolaction.h index c9af7d6d..c758de5c 100644 --- a/kolourpaint/tools/kptoolaction.h +++ b/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 (); diff --git a/kolourpaint/tools/kptoolairspray.cpp b/kolourpaint/tools/kptoolairspray.cpp index f8aabce1..0bf50b12 100644 --- a/kolourpaint/tools/kptoolairspray.cpp +++ b/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); - maskPainter.begin (&tqmask); + mask = kpPixmapFX::getNonNullMask (pixmap); + 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 ()) - pixmap.setMask (tqmask); + if (!mask.isNull ()) + pixmap.setMask (mask); viewManager ()->setFastUpdates (); document ()->setPixmapAt (pixmap, docRect.topLeft ()); diff --git a/kolourpaint/tools/kptoolautocrop.cpp b/kolourpaint/tools/kptoolautocrop.cpp index 1f3bab0c..41aeb398 100644 --- a/kolourpaint/tools/kptoolautocrop.cpp +++ b/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); } diff --git a/kolourpaint/tools/kptoolcrop.cpp b/kolourpaint/tools/kptoolcrop.cpp index e3916121..ac1967e5 100644 --- a/kolourpaint/tools/kptoolcrop.cpp +++ b/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. // diff --git a/kolourpaint/tools/kptoolflip.cpp b/kolourpaint/tools/kptoolflip.cpp index 1d85dc46..88c81b8e 100644 --- a/kolourpaint/tools/kptoolflip.cpp +++ b/kolourpaint/tools/kptoolflip.cpp @@ -149,8 +149,8 @@ void kpToolFlipCommand::flip () bool kpToolFlipDialog::s_lastIsVerticalFlip = true; -kpToolFlipDialog::kpToolFlipDialog (bool actOnSelection, TQWidget *tqparent) - : KDialogBase (tqparent, 0/*name*/, true/*modal*/, +kpToolFlipDialog::kpToolFlipDialog (bool actOnSelection, TQWidget *parent) + : KDialogBase (parent, 0/*name*/, true/*modal*/, actOnSelection ? i18n ("Flip Selection") : i18n ("Flip Image"), KDialogBase::Ok | KDialogBase::Cancel) { diff --git a/kolourpaint/tools/kptoolflip.h b/kolourpaint/tools/kptoolflip.h index 279fcec7..e1c858d6 100644 --- a/kolourpaint/tools/kptoolflip.h +++ b/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: diff --git a/kolourpaint/tools/kptoolpen.cpp b/kolourpaint/tools/kptoolpen.cpp index d87e3e39..5a601a83 100644 --- a/kolourpaint/tools/kptoolpen.cpp +++ b/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); - tqmask.fill (TQt::color0/*transparent*/); + TQBitmap mask (1, 1); + 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 diff --git a/kolourpaint/tools/kptoolpolygon.cpp b/kolourpaint/tools/kptoolpolygon.cpp index 5a074bb6..eade158b 100644 --- a/kolourpaint/tools/kptoolpolygon.cpp +++ b/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 diff --git a/kolourpaint/tools/kptoolpreviewdialog.cpp b/kolourpaint/tools/kptoolpreviewdialog.cpp index a9542989..2136e02d 100644 --- a/kolourpaint/tools/kptoolpreviewdialog.cpp +++ b/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), diff --git a/kolourpaint/tools/kptoolpreviewdialog.h b/kolourpaint/tools/kptoolpreviewdialog.h index 98cf28dc..5199a147 100644 --- a/kolourpaint/tools/kptoolpreviewdialog.h +++ b/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) diff --git a/kolourpaint/tools/kptoolrectangle.cpp b/kolourpaint/tools/kptoolrectangle.cpp index 491e0fae..df560ea2 100644 --- a/kolourpaint/tools/kptoolrectangle.cpp +++ b/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 && diff --git a/kolourpaint/tools/kptoolrotate.h b/kolourpaint/tools/kptoolrotate.h index 618b29c0..7b24df89 100644 --- a/kolourpaint/tools/kptoolrotate.h +++ b/kolourpaint/tools/kptoolrotate.h @@ -85,7 +85,7 @@ Q_OBJECT public: kpToolRotateDialog (bool actOnSelection, - kpMainWindow *tqparent, + kpMainWindow *parent, const char *name = 0); virtual ~kpToolRotateDialog (); diff --git a/kolourpaint/tools/kptoolselection.cpp b/kolourpaint/tools/kptoolselection.cpp index 2d796ff0..5a4d7237 100644 --- a/kolourpaint/tools/kptoolselection.cpp +++ b/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) diff --git a/kolourpaint/tools/kptoolskew.cpp b/kolourpaint/tools/kptoolskew.cpp index 7cc4aa7b..eec804d7 100644 --- a/kolourpaint/tools/kptoolskew.cpp +++ b/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; diff --git a/kolourpaint/tools/kptoolskew.h b/kolourpaint/tools/kptoolskew.h index 63703c9b..6db5204b 100644 --- a/kolourpaint/tools/kptoolskew.h +++ b/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 (); diff --git a/kolourpaint/views/kpthumbnailview.cpp b/kolourpaint/views/kpthumbnailview.cpp index 7332433a..54281ba4 100644 --- a/kolourpaint/views/kpthumbnailview.cpp +++ b/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) { } diff --git a/kolourpaint/views/kpthumbnailview.h b/kolourpaint/views/kpthumbnailview.h index 5f2e1664..eab2f16c 100644 --- a/kolourpaint/views/kpthumbnailview.h +++ b/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 diff --git a/kolourpaint/views/kpunzoomedthumbnailview.cpp b/kolourpaint/views/kpunzoomedthumbnailview.cpp index dea4e089..de7dfa0f 100644 --- a/kolourpaint/views/kpunzoomedthumbnailview.cpp +++ b/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 ()) diff --git a/kolourpaint/views/kpunzoomedthumbnailview.h b/kolourpaint/views/kpunzoomedthumbnailview.h index 7e81a5db..554d8037 100644 --- a/kolourpaint/views/kpunzoomedthumbnailview.h +++ b/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 diff --git a/kolourpaint/views/kpzoomedthumbnailview.cpp b/kolourpaint/views/kpzoomedthumbnailview.cpp index adef47c0..b2315a9f 100644 --- a/kolourpaint/views/kpzoomedthumbnailview.cpp +++ b/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 (); diff --git a/kolourpaint/views/kpzoomedthumbnailview.h b/kolourpaint/views/kpzoomedthumbnailview.h index c35c22bb..a3b8fd25 100644 --- a/kolourpaint/views/kpzoomedthumbnailview.h +++ b/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(). diff --git a/kolourpaint/views/kpzoomedview.cpp b/kolourpaint/views/kpzoomedview.cpp index 402b8e39..c2b1f47d 100644 --- a/kolourpaint/views/kpzoomedview.cpp +++ b/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 (); diff --git a/kolourpaint/views/kpzoomedview.h b/kolourpaint/views/kpzoomedview.h index e0228fde..2581aeef 100644 --- a/kolourpaint/views/kpzoomedview.h +++ b/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. diff --git a/kolourpaint/widgets/kpcolorsimilaritycube.cpp b/kolourpaint/widgets/kpcolorsimilaritycube.cpp index 07693130..b2f3441a 100644 --- a/kolourpaint/widgets/kpcolorsimilaritycube.cpp +++ b/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) { diff --git a/kolourpaint/widgets/kpcolorsimilaritycube.h b/kolourpaint/widgets/kpcolorsimilaritycube.h index d2fb85d2..0cf9f92a 100644 --- a/kolourpaint/widgets/kpcolorsimilaritycube.h +++ b/kolourpaint/widgets/kpcolorsimilaritycube.h @@ -46,7 +46,7 @@ public: kpColorSimilarityCube (int look, kpMainWindow *mainWindow, - TQWidget *tqparent, + TQWidget *parent, const char *name = 0); virtual ~kpColorSimilarityCube (); diff --git a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp b/kolourpaint/widgets/kpcolorsimilaritydialog.cpp index ee4ff1b0..d71ac501 100644 --- a/kolourpaint/widgets/kpcolorsimilaritydialog.cpp +++ b/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) diff --git a/kolourpaint/widgets/kpcolorsimilaritydialog.h b/kolourpaint/widgets/kpcolorsimilaritydialog.h index df4e2445..b365819e 100644 --- a/kolourpaint/widgets/kpcolorsimilaritydialog.h +++ b/kolourpaint/widgets/kpcolorsimilaritydialog.h @@ -42,7 +42,7 @@ Q_OBJECT public: kpColorSimilarityDialog (kpMainWindow *mainWindow, - TQWidget *tqparent, + TQWidget *parent, const char *name = 0); virtual ~kpColorSimilarityDialog (); diff --git a/kolourpaint/widgets/kpcolortoolbar.cpp b/kolourpaint/widgets/kpcolortoolbar.cpp index 7fd520f7..cfdb6820 100644 --- a/kolourpaint/widgets/kpcolortoolbar.cpp +++ b/kolourpaint/widgets/kpcolortoolbar.cpp @@ -61,8 +61,8 @@ */ kpDualColorButton::kpDualColorButton (kpMainWindow *mainWindow, - TQWidget *tqparent, const char *name) - : TQFrame (tqparent, name, TQt::WNoAutoErase/*no flicker*/), + TQWidget *parent, const char *name) + : 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) - : TQFrame (tqparent, name) +kpTransparentColorCell::kpTransparentColorCell (TQWidget *parent, const char *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) { diff --git a/kolourpaint/widgets/kpcolortoolbar.h b/kolourpaint/widgets/kpcolortoolbar.h index b1e8faa8..59f13fb7 100644 --- a/kolourpaint/widgets/kpcolortoolbar.h +++ b/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 (); diff --git a/kolourpaint/widgets/kpresizesignallinglabel.cpp b/kolourpaint/widgets/kpresizesignallinglabel.cpp index b62f3679..19b276a9 100644 --- a/kolourpaint/widgets/kpresizesignallinglabel.cpp +++ b/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) { } diff --git a/kolourpaint/widgets/kpresizesignallinglabel.h b/kolourpaint/widgets/kpresizesignallinglabel.h index 88f4477c..a97fc037 100644 --- a/kolourpaint/widgets/kpresizesignallinglabel.h +++ b/kolourpaint/widgets/kpresizesignallinglabel.h @@ -38,8 +38,8 @@ Q_OBJECT TQ_OBJECT public: - kpResizeSignallingLabel (const TQString &string, TQWidget *tqparent, const char *name = 0); - kpResizeSignallingLabel (TQWidget *tqparent, const char *name = 0); + kpResizeSignallingLabel (const TQString &string, TQWidget *parent, const char *name = 0); + kpResizeSignallingLabel (TQWidget *parent, const char *name = 0); virtual ~kpResizeSignallingLabel (); signals: diff --git a/kolourpaint/widgets/kpsqueezedtextlabel.cpp b/kolourpaint/widgets/kpsqueezedtextlabel.cpp index 8cd4dfbb..6e7386ec 100644 --- a/kolourpaint/widgets/kpsqueezedtextlabel.cpp +++ b/kolourpaint/widgets/kpsqueezedtextlabel.cpp @@ -38,14 +38,14 @@ #include <klocale.h> -kpSqueezedTextLabel::kpSqueezedTextLabel (TQWidget *tqparent, const char *name) - : TQLabel (tqparent, name), +kpSqueezedTextLabel::kpSqueezedTextLabel (TQWidget *parent, const char *name) + : TQLabel (parent, name), m_showEllipsis (true) { } -kpSqueezedTextLabel::kpSqueezedTextLabel (const TQString &text, TQWidget *tqparent, const char *name) - : TQLabel (tqparent, name), +kpSqueezedTextLabel::kpSqueezedTextLabel (const TQString &text, TQWidget *parent, const char *name) + : TQLabel (parent, name), m_showEllipsis (true) { setText (text); diff --git a/kolourpaint/widgets/kpsqueezedtextlabel.h b/kolourpaint/widgets/kpsqueezedtextlabel.h index 1169be63..4697af8a 100644 --- a/kolourpaint/widgets/kpsqueezedtextlabel.h +++ b/kolourpaint/widgets/kpsqueezedtextlabel.h @@ -40,8 +40,8 @@ Q_OBJECT TQ_OBJECT public: - kpSqueezedTextLabel (TQWidget *tqparent, const char *name = 0); - kpSqueezedTextLabel (const TQString &text, TQWidget *tqparent, const char *name = 0); + kpSqueezedTextLabel (TQWidget *parent, const char *name = 0); + kpSqueezedTextLabel (const TQString &text, TQWidget *parent, const char *name = 0); virtual TQSize tqminimumSizeHint () const; diff --git a/kolourpaint/widgets/kptooltoolbar.cpp b/kolourpaint/widgets/kptooltoolbar.cpp index 163a7f49..ba048d5c 100644 --- a/kolourpaint/widgets/kptooltoolbar.cpp +++ b/kolourpaint/widgets/kptooltoolbar.cpp @@ -58,8 +58,8 @@ class kpToolButton : public TQToolButton { public: - kpToolButton (kpTool *tool, TQWidget *tqparent) - : TQToolButton (tqparent), + kpToolButton (kpTool *tool, TQWidget *parent) + : TQToolButton (parent), m_tool (tool) { } diff --git a/kolourpaint/widgets/kptoolwidgetbase.cpp b/kolourpaint/widgets/kptoolwidgetbase.cpp index ef5f35c3..3d1d3cff 100644 --- a/kolourpaint/widgets/kptoolwidgetbase.cpp +++ b/kolourpaint/widgets/kptoolwidgetbase.cpp @@ -45,8 +45,8 @@ #include <kpeffectinvert.h> -kpToolWidgetBase::kpToolWidgetBase (TQWidget *tqparent, const char *name) - : TQFrame (tqparent, name), +kpToolWidgetBase::kpToolWidgetBase (TQWidget *parent, const char *name) + : TQFrame (parent, name), m_invertSelectedPixmap (true), m_selectedRow (-1), m_selectedCol (-1) { diff --git a/kolourpaint/widgets/kptoolwidgetbase.h b/kolourpaint/widgets/kptoolwidgetbase.h index 8bef2a67..4afb8d35 100644 --- a/kolourpaint/widgets/kptoolwidgetbase.h +++ b/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: diff --git a/kolourpaint/widgets/kptoolwidgetbrush.cpp b/kolourpaint/widgets/kptoolwidgetbrush.cpp index 69445905..0c583126 100644 --- a/kolourpaint/widgets/kptoolwidgetbrush.cpp +++ b/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) - : kpToolWidgetBase (tqparent, name) +kpToolWidgetBrush::kpToolWidgetBrush (TQWidget *parent, const char *name) + : kpToolWidgetBase (parent, name) { setInvertSelectedPixmap (); diff --git a/kolourpaint/widgets/kptoolwidgetbrush.h b/kolourpaint/widgets/kptoolwidgetbrush.h index 7fc2ffe0..0fd2f46a 100644 --- a/kolourpaint/widgets/kptoolwidgetbrush.h +++ b/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: diff --git a/kolourpaint/widgets/kptoolwidgeterasersize.cpp b/kolourpaint/widgets/kptoolwidgeterasersize.cpp index c4354dea..d27965a6 100644 --- a/kolourpaint/widgets/kptoolwidgeterasersize.cpp +++ b/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) - : kpToolWidgetBase (tqparent, name) +kpToolWidgetEraserSize::kpToolWidgetEraserSize (TQWidget *parent, const char *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 ()); - tqmask.fill (TQt::color0/*transparent*/); + TQBitmap mask (previewPixmap.width (), previewPixmap.height ()); + 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*/); diff --git a/kolourpaint/widgets/kptoolwidgeterasersize.h b/kolourpaint/widgets/kptoolwidgeterasersize.h index 1568088d..2f7c0be0 100644 --- a/kolourpaint/widgets/kptoolwidgeterasersize.h +++ b/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; diff --git a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp index e2a1afce..a87714c5 100644 --- a/kolourpaint/widgets/kptoolwidgetfillstyle.cpp +++ b/kolourpaint/widgets/kptoolwidgetfillstyle.cpp @@ -42,8 +42,8 @@ #include <kptool.h> -kpToolWidgetFillStyle::kpToolWidgetFillStyle (TQWidget *tqparent, const char *name) - : kpToolWidgetBase (tqparent, name) +kpToolWidgetFillStyle::kpToolWidgetFillStyle (TQWidget *parent, const char *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 ()); - tqmask.fill (TQt::color0); + TQBitmap mask (pixmap.width (), pixmap.height ()); + 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; } diff --git a/kolourpaint/widgets/kptoolwidgetfillstyle.h b/kolourpaint/widgets/kptoolwidgetfillstyle.h index 82ee1357..c32b3b65 100644 --- a/kolourpaint/widgets/kptoolwidgetfillstyle.h +++ b/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 diff --git a/kolourpaint/widgets/kptoolwidgetlinewidth.cpp b/kolourpaint/widgets/kptoolwidgetlinewidth.cpp index 0d419333..2ac9e39c 100644 --- a/kolourpaint/widgets/kptoolwidgetlinewidth.cpp +++ b/kolourpaint/widgets/kptoolwidgetlinewidth.cpp @@ -36,8 +36,8 @@ static int lineWidths [] = {1, 2, 3, 5, 8}; -kpToolWidgetLineWidth::kpToolWidgetLineWidth (TQWidget *tqparent, const char *name) - : kpToolWidgetBase (tqparent, name) +kpToolWidgetLineWidth::kpToolWidgetLineWidth (TQWidget *parent, const char *name) + : kpToolWidgetBase (parent, name) { setInvertSelectedPixmap (); diff --git a/kolourpaint/widgets/kptoolwidgetlinewidth.h b/kolourpaint/widgets/kptoolwidgetlinewidth.h index 8ac76909..6cc82d26 100644 --- a/kolourpaint/widgets/kptoolwidgetlinewidth.h +++ b/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; diff --git a/kolourpaint/widgets/kptoolwidgetopaqueortransparent.cpp b/kolourpaint/widgets/kptoolwidgetopaqueortransparent.cpp index 6479d891..4cd5b6f6 100644 --- a/kolourpaint/widgets/kptoolwidgetopaqueortransparent.cpp +++ b/kolourpaint/widgets/kptoolwidgetopaqueortransparent.cpp @@ -35,8 +35,8 @@ #include <klocale.h> -kpToolWidgetOpaqueOrTransparent::kpToolWidgetOpaqueOrTransparent (TQWidget *tqparent, const char *name) - : kpToolWidgetBase (tqparent, name) +kpToolWidgetOpaqueOrTransparent::kpToolWidgetOpaqueOrTransparent (TQWidget *parent, const char *name) + : kpToolWidgetBase (parent, name) { setInvertSelectedPixmap (false); diff --git a/kolourpaint/widgets/kptoolwidgetopaqueortransparent.h b/kolourpaint/widgets/kptoolwidgetopaqueortransparent.h index 45e49a2f..613841f2 100644 --- a/kolourpaint/widgets/kptoolwidgetopaqueortransparent.h +++ b/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; diff --git a/kolourpaint/widgets/kptoolwidgetspraycansize.cpp b/kolourpaint/widgets/kptoolwidgetspraycansize.cpp index cce8f1b5..503cecd2 100644 --- a/kolourpaint/widgets/kptoolwidgetspraycansize.cpp +++ b/kolourpaint/widgets/kptoolwidgetspraycansize.cpp @@ -44,8 +44,8 @@ static int spraycanSizes [] = {9, 17, 29}; -kpToolWidgetSpraycanSize::kpToolWidgetSpraycanSize (TQWidget *tqparent, const char *name) - : kpToolWidgetBase (tqparent, name) +kpToolWidgetSpraycanSize::kpToolWidgetSpraycanSize (TQWidget *parent, const char *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 ()); - tqmask.fill (TQt::color0); + TQBitmap mask (pixmap.width (), pixmap.height ()); + 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) diff --git a/kolourpaint/widgets/kptoolwidgetspraycansize.h b/kolourpaint/widgets/kptoolwidgetspraycansize.h index ef86891f..dc10ac1b 100644 --- a/kolourpaint/widgets/kptoolwidgetspraycansize.h +++ b/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; diff --git a/kooka/dwmenuaction.cpp b/kooka/dwmenuaction.cpp index d77c8d16..da0cee48 100644 --- a/kooka/dwmenuaction.cpp +++ b/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())); diff --git a/kooka/dwmenuaction.h b/kooka/dwmenuaction.h index d6cac229..958ebe82 100644 --- a/kooka/dwmenuaction.h +++ b/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(); diff --git a/kooka/imageselectline.cpp b/kooka/imageselectline.cpp index 99ba935e..a21b56c0 100644 --- a/kooka/imageselectline.cpp +++ b/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 ) - : TQHBox( tqparent ) +ImageSelectLine::ImageSelectLine( TQWidget *parent, const TQString& text ) + : TQHBox( parent ) { setSpacing( 5 ); (void) new TQLabel( text, this ); diff --git a/kooka/imageselectline.h b/kooka/imageselectline.h index a9672edf..c3baae29 100644 --- a/kooka/imageselectline.h +++ b/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& ); diff --git a/kooka/img_saver.cpp b/kooka/img_saver.cpp index e0bf399d..847023d1 100644 --- a/kooka/img_saver.cpp +++ b/kooka/img_saver.cpp @@ -58,8 +58,8 @@ #include "previewer.h" #include "kookaimage.h" -FormatDialog::FormatDialog( TQWidget *tqparent, const TQString&, const char *name ) - :KDialogBase( tqparent, name, true, +FormatDialog::FormatDialog( TQWidget *parent, const TQString&, const char *name ) + :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 ) - : TQObject( tqparent ) +ImgSaver::ImgSaver( TQWidget *parent, const KURL dir_name ) + : 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 ) - :TQObject( tqparent ) +ImgSaver::ImgSaver( TQWidget *parent ) + :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 ) { diff --git a/kooka/img_saver.h b/kooka/img_saver.h index 31f6d8ab..0f9a713a 100644 --- a/kooka/img_saver.h +++ b/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 *tqparent ); + ImgSaver( TQWidget *parent, const KURL ); + ImgSaver( TQWidget *parent ); TQString errorString( ImgSaveStat ); /** diff --git a/kooka/imgnamecombo.cpp b/kooka/imgnamecombo.cpp index 5205f1b1..8190d5bc 100644 --- a/kooka/imgnamecombo.cpp +++ b/kooka/imgnamecombo.cpp @@ -38,8 +38,8 @@ #include "imgnamecombo.h" #include "img_saver.h" -ImageNameCombo::ImageNameCombo( TQWidget *tqparent ) - : KComboBox( tqparent ) +ImageNameCombo::ImageNameCombo( TQWidget *parent ) + : KComboBox( parent ) { setInsertionPolicy( TQComboBox::AtTop ); } diff --git a/kooka/imgprintdialog.cpp b/kooka/imgprintdialog.cpp index 98a783f4..e79c92df 100644 --- a/kooka/imgprintdialog.cpp +++ b/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 ) - : KPrintDialogPage( tqparent, name ), +ImgPrintDialog::ImgPrintDialog( KookaImage *img, TQWidget *parent, const char* name ) + : KPrintDialogPage( parent, name ), m_image(img), m_ignoreSignal(false) { diff --git a/kooka/imgprintdialog.h b/kooka/imgprintdialog.h index 389a546c..3176afb8 100644 --- a/kooka/imgprintdialog.h +++ b/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); diff --git a/kooka/kocrbase.cpp b/kooka/kocrbase.cpp index 4c9ccc14..2cd5d20b 100644 --- a/kooka/kocrbase.cpp +++ b/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 ); } diff --git a/kooka/kocrgocr.cpp b/kooka/kocrgocr.cpp index dbb255c4..ca913f1d 100644 --- a/kooka/kocrgocr.cpp +++ b/kooka/kocrgocr.cpp @@ -58,8 +58,8 @@ -KGOCRDialog::KGOCRDialog( TQWidget *tqparent, KSpellConfig *spellConfig ) - :KOCRBase( tqparent, spellConfig, KDialogBase::Tabbed ), +KGOCRDialog::KGOCRDialog( TQWidget *parent, KSpellConfig *spellConfig ) + :KOCRBase( parent, spellConfig, KDialogBase::Tabbed ), m_ocrCmd( TQString()) { kdDebug(28000) << "Starting KOCR-Start-Dialog!" << endl; diff --git a/kooka/kocrkadmos.cpp b/kooka/kocrkadmos.cpp index 99f86a4f..59afa1a4 100644 --- a/kooka/kocrkadmos.cpp +++ b/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 ) - :KOCRBase( tqparent, spellConfig, KDialogBase::Tabbed ), +KadmosDialog::KadmosDialog( TQWidget *parent, KSpellConfig *spellConfig ) + :KOCRBase( parent, spellConfig, KDialogBase::Tabbed ), m_cbNoise(0), m_cbAutoscale(0), m_haveNorm(false) diff --git a/kooka/kocrocrad.cpp b/kooka/kocrocrad.cpp index ff675231..b9365767 100644 --- a/kooka/kocrocrad.cpp +++ b/kooka/kocrocrad.cpp @@ -54,8 +54,8 @@ -ocradDialog::ocradDialog( TQWidget *tqparent, KSpellConfig *spellConfig ) - :KOCRBase( tqparent, spellConfig, KDialogBase::Tabbed ), +ocradDialog::ocradDialog( TQWidget *parent, KSpellConfig *spellConfig ) + :KOCRBase( parent, spellConfig, KDialogBase::Tabbed ), m_ocrCmd( TQString()), m_orfUrlRequester(0L), m_layoutMode(0), diff --git a/kooka/kookaimage.cpp b/kooka/kookaimage.cpp index 4bf7976c..ab491429 100644 --- a/kooka/kookaimage.cpp +++ b/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; } } diff --git a/kooka/kookaimage.h b/kooka/kookaimage.h index 559f1469..b56c086b 100644 --- a/kooka/kookaimage.h +++ b/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 */ diff --git a/kooka/kookapref.cpp b/kooka/kookapref.cpp index 49271414..bebd60fa 100644 --- a/kooka/kookapref.cpp +++ b/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, diff --git a/kooka/kookarc b/kooka/kookarc index a604a280..13875fff 100644 --- a/kooka/kookarc +++ b/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 diff --git a/kooka/kookaview.cpp b/kooka/kookaview.cpp index 71004040..5586ee43 100644 --- a/kooka/kookaview.cpp +++ b/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); - tqparent->setMainDockWidget( m_mainDock); + parent->setView( 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 ); diff --git a/kooka/kookaview.h b/kooka/kookaview.h index 21d5509a..76910cdc 100644 --- a/kooka/kookaview.h +++ b/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 diff --git a/kooka/ksaneocr.cpp b/kooka/ksaneocr.cpp index 83ef30da..67d0aaca 100644 --- a/kooka/ksaneocr.cpp +++ b/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.")); diff --git a/kooka/ksaneocr.h b/kooka/ksaneocr.h index 670c410b..bc2bc844 100644 --- a/kooka/ksaneocr.h +++ b/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 ); diff --git a/kooka/ocrresedit.cpp b/kooka/ocrresedit.cpp index 26785b4c..f8e8f2c2 100644 --- a/kooka/ocrresedit.cpp +++ b/kooka/ocrresedit.cpp @@ -36,8 +36,8 @@ /* -------------------- ocrResEdit -------------------- */ -ocrResEdit::ocrResEdit( TQWidget *tqparent ) - : TQTextEdit(tqparent) +ocrResEdit::ocrResEdit( TQWidget *parent ) + : TQTextEdit(parent) { m_updateColor.setNamedColor( "SeaGreen"); m_ignoreColor.setNamedColor( "CadetBlue4" ); diff --git a/kooka/ocrresedit.h b/kooka/ocrresedit.h index f7e40dca..72517f4b 100644 --- a/kooka/ocrresedit.h +++ b/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, diff --git a/kooka/scanpackager.cpp b/kooka/scanpackager.cpp index fbda481f..9a8c9d3a 100644 --- a/kooka/scanpackager.cpp +++ b/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 ) { diff --git a/kooka/scanpackager.h b/kooka/scanpackager.h index c50c4d56..ab4519e6 100644 --- a/kooka/scanpackager.h +++ b/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; diff --git a/kooka/thumbview.cpp b/kooka/thumbview.cpp index 60312bad..a431f1ea 100644 --- a/kooka/thumbview.cpp +++ b/kooka/thumbview.cpp @@ -47,8 +47,8 @@ -ThumbView::ThumbView( TQWidget *tqparent, const char *name ) - : TQVBox( tqparent ), +ThumbView::ThumbView( TQWidget *parent, const char *name ) + : 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() ) diff --git a/kooka/thumbview.h b/kooka/thumbview.h index 52b2bf05..49df9056 100644 --- a/kooka/thumbview.h +++ b/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) diff --git a/kooka/thumbviewitem.cpp b/kooka/thumbviewitem.cpp index fe62e7e8..e682c34b 100644 --- a/kooka/thumbviewitem.cpp +++ b/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 ) { } diff --git a/kooka/thumbviewitem.h b/kooka/thumbviewitem.h index 5bf829dd..4478df34 100644 --- a/kooka/thumbviewitem.h +++ b/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 ); diff --git a/kpdf/conf/preferencesdialog.cpp b/kpdf/conf/preferencesdialog.cpp index 418517a1..61211008 100644 --- a/kpdf/conf/preferencesdialog.cpp +++ b/kpdf/conf/preferencesdialog.cpp @@ -18,8 +18,8 @@ // reimplementing this #include "preferencesdialog.h" -PreferencesDialog::PreferencesDialog( TQWidget * tqparent, KConfigSkeleton * skeleton ) - : KConfigDialog( tqparent, "preferences", skeleton ) +PreferencesDialog::PreferencesDialog( TQWidget * parent, KConfigSkeleton * skeleton ) + : KConfigDialog( parent, "preferences", skeleton ) { m_general = new DlgGeneral(0); m_performance = new DlgPerformance(0); diff --git a/kpdf/conf/preferencesdialog.h b/kpdf/conf/preferencesdialog.h index 316aa05b..36aaa909 100644 --- a/kpdf/conf/preferencesdialog.h +++ b/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. diff --git a/kpdf/core/document.cpp b/kpdf/core/document.cpp index 9062f976..2074789d 100644 --- a/kpdf/core/document.cpp +++ b/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 diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp index 0a445a37..6550a543 100644 --- a/kpdf/core/generator_pdf/generator_pdf.cpp +++ b/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(); diff --git a/kpdf/core/generator_pdf/generator_pdf.h b/kpdf/core/generator_pdf/generator_pdf.h index b7d2deb2..0aba8224 100644 --- a/kpdf/core/generator_pdf/generator_pdf.h +++ b/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 diff --git a/kpdf/core/generator_pdf/gp_outputdev.h b/kpdf/core/generator_pdf/gp_outputdev.h index 7eea425f..7788b1db 100644 --- a/kpdf/core/generator_pdf/gp_outputdev.h +++ b/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 diff --git a/kpdf/part.cpp b/kpdf/part.cpp index 81756ff5..0f8f2d9f 100644 --- a/kpdf/part.cpp +++ b/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()")) - connect( m_document, TQT_SIGNAL( quit() ), tqparent, TQT_SLOT( slotQuit() ) ); + if (parent && parent->tqmetaObject()->slotNames(true).contains("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) - : KParts::BrowserExtension( tqparent, "KPDF::BrowserExtension" ) +BrowserExtension::BrowserExtension(Part* parent) + : 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" diff --git a/kpdf/part.h b/kpdf/part.h index 48e11bb8..b745ca29 100644 --- a/kpdf/part.h +++ b/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(); diff --git a/kpdf/ui/minibar.cpp b/kpdf/ui/minibar.cpp index c5d85cea..db692703 100644 --- a/kpdf/ui/minibar.cpp +++ b/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 ) - : TQFrame( tqparent, "miniBar" ), m_document( document ), +MiniBar::MiniBar( TQWidget * parent, KPDFDocument * 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 ) - : TQWidget( tqparent, "progress", WNoAutoErase ), - m_miniBar( tqparent ), m_progressPercentage( -1 ) +ProgressWidget::ProgressWidget( MiniBar * parent ) + : TQWidget( parent, "progress", WNoAutoErase ), + m_miniBar( parent ), m_progressPercentage( -1 ) { setFixedHeight( 4 ); setMouseTracking( true ); @@ -325,8 +325,8 @@ void ProgressWidget::paintEvent( TQPaintEvent * e ) /** PagesEdit **/ -PagesEdit::PagesEdit( MiniBar * tqparent ) - : TQLineEdit( tqparent ), m_miniBar( tqparent ), m_eatClick( false ) +PagesEdit::PagesEdit( MiniBar * parent ) + : 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 ) - : TQPushButton( tqparent ) +HoverButton::HoverButton( TQWidget * parent ) + : TQPushButton( parent ) { setMouseTracking( true ); #if KDE_IS_VERSION(3,3,90) diff --git a/kpdf/ui/minibar.h b/kpdf/ui/minibar.h index 99bc13aa..f9857ec7 100644 --- a/kpdf/ui/minibar.h +++ b/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 diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp index 42024f55..de5fad0c 100644 --- a/kpdf/ui/pageview.cpp +++ b/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 ) - : TQScrollView( tqparent, "KPDF::pageView", WStaticContents | WNoAutoErase ) +PageView::PageView( TQWidget *parent, KPDFDocument *document ) + : TQScrollView( parent, "KPDF::pageView", WStaticContents | WNoAutoErase ) { // create and initialize private storage structure d = new PageViewPrivate(); diff --git a/kpdf/ui/pageview.h b/kpdf/ui/pageview.h index 3bec8be0..8895c9ec 100644 --- a/kpdf/ui/pageview.h +++ b/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! ) diff --git a/kpdf/ui/pageviewutils.cpp b/kpdf/ui/pageviewutils.cpp index 369bcd83..a948d49c 100644 --- a/kpdf/ui/pageviewutils.cpp +++ b/kpdf/ui/pageviewutils.cpp @@ -21,8 +21,8 @@ #include "core/page.h" #include "conf/settings.h" -PageViewMessage::PageViewMessage( TQWidget * tqparent ) - : TQWidget( tqparent, "pageViewMessage" ), m_timer( 0 ) +PageViewMessage::PageViewMessage( TQWidget * parent ) + : 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 - static TQBitmap tqmask; - tqmask.resize( tqgeometry.size() ); + // resize pixmap, mask and widget + static TQBitmap mask; + mask.resize( tqgeometry.size() ); m_pixmap.resize( tqgeometry.size() ); resize( tqgeometry.size() ); - // create and set transparency tqmask - TQPainter maskPainter( &tqmask); - tqmask.fill( TQt::black ); + // create and set transparency mask + TQPainter maskPainter( &mask); + 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 ); diff --git a/kpdf/ui/pageviewutils.h b/kpdf/ui/pageviewutils.h index 0bd6bd32..ceac9fe2 100644 --- a/kpdf/ui/pageviewutils.h +++ b/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 ); diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp index cc882f7a..d4e14b6a 100644 --- a/kpdf/ui/presentationwidget.cpp +++ b/kpdf/ui/presentationwidget.cpp @@ -52,8 +52,8 @@ struct PresentationFrame }; -PresentationWidget::PresentationWidget( TQWidget * tqparent, KPDFDocument * doc ) - : TQDialog( tqparent, "presentationWidget", true, WDestructiveClose | WStyle_NoBorder), +PresentationWidget::PresentationWidget( TQWidget * parent, KPDFDocument * doc ) + : TQDialog( parent, "presentationWidget", true, WDestructiveClose | WStyle_NoBorder), m_pressedLink( 0 ), m_handCursor( false ), m_document( doc ), m_frameIndex( -1 ) { // set look and tqgeometry diff --git a/kpdf/ui/presentationwidget.h b/kpdf/ui/presentationwidget.h index 00ae2bfb..26db0836 100644 --- a/kpdf/ui/presentationwidget.h +++ b/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 ); diff --git a/kpdf/ui/propertiesdialog.cpp b/kpdf/ui/propertiesdialog.cpp index 02743ccb..d9cee932 100644 --- a/kpdf/ui/propertiesdialog.cpp +++ b/kpdf/ui/propertiesdialog.cpp @@ -19,8 +19,8 @@ #include "propertiesdialog.h" #include "core/document.h" -PropertiesDialog::PropertiesDialog(TQWidget *tqparent, KPDFDocument *doc) - : KDialogBase( Tabbed, i18n( "Unknown File" ), Ok, Ok, tqparent, 0, true, true ) +PropertiesDialog::PropertiesDialog(TQWidget *parent, KPDFDocument *doc) + : KDialogBase( Tabbed, i18n( "Unknown File" ), Ok, Ok, parent, 0, true, true ) { // Properties TQFrame *page = addPage(i18n("Properties")); diff --git a/kpdf/ui/propertiesdialog.h b/kpdf/ui/propertiesdialog.h index f5541e34..d5e3229a 100644 --- a/kpdf/ui/propertiesdialog.h +++ b/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 diff --git a/kpdf/ui/searchwidget.cpp b/kpdf/ui/searchwidget.cpp index 116df031..7ca3ba49 100644 --- a/kpdf/ui/searchwidget.cpp +++ b/kpdf/ui/searchwidget.cpp @@ -28,8 +28,8 @@ #define LEDIT_ID 2 #define FIND_ID 3 -SearchWidget::SearchWidget( TQWidget * tqparent, KPDFDocument * document ) - : KToolBar( tqparent, "iSearchBar" ), m_document( document ), +SearchWidget::SearchWidget( TQWidget * parent, KPDFDocument * document ) + : KToolBar( parent, "iSearchBar" ), m_document( document ), m_searchType( 0 ), m_caseSensitive( false ) { // change toolbar appearance diff --git a/kpdf/ui/searchwidget.h b/kpdf/ui/searchwidget.h index a39e01ad..c2d2d1c1 100644 --- a/kpdf/ui/searchwidget.h +++ b/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: diff --git a/kpdf/ui/thumbnaillist.cpp b/kpdf/ui/thumbnaillist.cpp index 8c6ab951..a41869d6 100644 --- a/kpdf/ui/thumbnaillist.cpp +++ b/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 ) - : TQScrollView( tqparent, "KPDF::Thumbnails", WNoAutoErase | WStaticContents ), +ThumbnailList::ThumbnailList( TQWidget *parent, KPDFDocument *document ) + : 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 ) - : TQWidget( tqparent, 0, WNoAutoErase ), m_tl( tl ), m_page( kp ), +ThumbnailWidget::ThumbnailWidget( TQWidget * parent, const KPDFPage * kp, ThumbnailList * tl ) + : 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 ) - : KToolBar( tqparent, "ThumbsControlBar" ) +ThumbnailController::ThumbnailController( TQWidget * parent, ThumbnailList * list ) + : KToolBar( parent, "ThumbsControlBar" ) { // change toolbar appearance setMargin( 3 ); diff --git a/kpdf/ui/thumbnaillist.h b/kpdf/ui/thumbnaillist.h index b28bd741..549ea20c 100644 --- a/kpdf/ui/thumbnaillist.h +++ b/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 diff --git a/kpdf/ui/toc.cpp b/kpdf/ui/toc.cpp index 08880c3d..015ba313 100644 --- a/kpdf/ui/toc.cpp +++ b/kpdf/ui/toc.cpp @@ -25,8 +25,8 @@ class TOCItem : public KListViewItem { public: - TOCItem( KListView *tqparent, TOCItem *after, const TQDomElement & e ) - : KListViewItem( tqparent, after, e.tagName() ), m_element( e ) + TOCItem( KListView *parent, TOCItem *after, const TQDomElement & 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 ) - : KListViewItem( tqparent, after, e.tagName() ), m_element( e ) + TOCItem( KListViewItem *parent, TOCItem *after, const TQDomElement & 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 diff --git a/kpdf/ui/toc.h b/kpdf/ui/toc.h index 93824166..eaccc3d9 100644 --- a/kpdf/ui/toc.h +++ b/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 diff --git a/kpovmodeler/baseinsertrules.xml b/kpovmodeler/baseinsertrules.xml index ad1917d9..24aa7dd5 100644 --- a/kpovmodeler/baseinsertrules.xml +++ b/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> diff --git a/kpovmodeler/pmactions.cpp b/kpovmodeler/pmactions.cpp index d13ddf06..18af4c37 100644 --- a/kpovmodeler/pmactions.cpp +++ b/kpovmodeler/pmactions.cpp @@ -34,8 +34,8 @@ class PMComboBox : public TQComboBox { public: - PMComboBox( TQWidget* tqparent, const char* name = 0 ) - : TQComboBox( tqparent, name ) + PMComboBox( TQWidget* parent, const char* name = 0 ) + : 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 ) - : KAction( text, accel, tqparent, name ) + TQObject* parent, const char* 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 ) - : TQToolButton( tqparent, name ) + PMToolBarLabel( const TQString& text, TQWidget* parent = 0, const char* name = 0 ) + : TQToolButton( parent, name ) { setText( text ); } @@ -143,8 +143,8 @@ protected: } }; -PMLabelAction::PMLabelAction( const TQString &text, TQObject *tqparent, const char *name ) - : KAction( text, 0, tqparent, name ) +PMLabelAction::PMLabelAction( const TQString &text, TQObject *parent, const char *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 ) - : KAction( text, accel, tqparent, name ) + TQObject* parent, const char* name ) + : KAction( text, accel, parent, name ) { m_receiver = receiver; m_member = member; diff --git a/kpovmodeler/pmactions.h b/kpovmodeler/pmactions.h index 4e058273..bd397015 100644 --- a/kpovmodeler/pmactions.h +++ b/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 ); diff --git a/kpovmodeler/pmaddcommand.cpp b/kpovmodeler/pmaddcommand.cpp index 5b258312..2eb78126 100644 --- a/kpovmodeler/pmaddcommand.cpp +++ b/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( ) ) - l->tqparent( )->takeChild( l ); + if( l->parent( ) ) + 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( ) ) - obj->tqparent( )->takeChild( obj ); + if( obj->parent( ) ) + obj->parent( )->takeChild( obj ); } if( m_pParentChangeMemento ) diff --git a/kpovmodeler/pmaddcommand.h b/kpovmodeler/pmaddcommand.h index a5759ea8..51beec31 100644 --- a/kpovmodeler/pmaddcommand.h +++ b/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) */ diff --git a/kpovmodeler/pmbicubicpatch.cpp b/kpovmodeler/pmbicubicpatch.cpp index df66ec52..dd281ceb 100644 --- a/kpovmodeler/pmbicubicpatch.cpp +++ b/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 ) diff --git a/kpovmodeler/pmbicubicpatch.h b/kpovmodeler/pmbicubicpatch.h index 2c1a623b..54baae43 100644 --- a/kpovmodeler/pmbicubicpatch.h +++ b/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 diff --git a/kpovmodeler/pmbicubicpatchedit.cpp b/kpovmodeler/pmbicubicpatchedit.cpp index 64cb3db8..fe91f1e0 100644 --- a/kpovmodeler/pmbicubicpatchedit.cpp +++ b/kpovmodeler/pmbicubicpatchedit.cpp @@ -29,8 +29,8 @@ #include <tqcheckbox.h> #include <klocale.h> -PMBicubicPatchEdit::PMBicubicPatchEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMBicubicPatchEdit::PMBicubicPatchEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmbicubicpatchedit.h b/kpovmodeler/pmbicubicpatchedit.h index cb27810f..bdf2a971 100644 --- a/kpovmodeler/pmbicubicpatchedit.h +++ b/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 ); diff --git a/kpovmodeler/pmblendmapmodifiers.cpp b/kpovmodeler/pmblendmapmodifiers.cpp index 22511200..e28fa7fb 100644 --- a/kpovmodeler/pmblendmapmodifiers.cpp +++ b/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 ) diff --git a/kpovmodeler/pmblendmapmodifiers.h b/kpovmodeler/pmblendmapmodifiers.h index fb7d2623..be5a863e 100644 --- a/kpovmodeler/pmblendmapmodifiers.h +++ b/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" ); } diff --git a/kpovmodeler/pmblendmapmodifiersedit.cpp b/kpovmodeler/pmblendmapmodifiersedit.cpp index b18f3eed..fd443623 100644 --- a/kpovmodeler/pmblendmapmodifiersedit.cpp +++ b/kpovmodeler/pmblendmapmodifiersedit.cpp @@ -37,8 +37,8 @@ #include <kdialog.h> #include <kfiledialog.h> -PMBlendMapModifiersEdit::PMBlendMapModifiersEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMBlendMapModifiersEdit::PMBlendMapModifiersEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmblendmapmodifiersedit.h b/kpovmodeler/pmblendmapmodifiersedit.h index db3c764e..69ec17dd 100644 --- a/kpovmodeler/pmblendmapmodifiersedit.h +++ b/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 ); diff --git a/kpovmodeler/pmblob.cpp b/kpovmodeler/pmblob.cpp index 5dc5bb6c..317c18d7 100644 --- a/kpovmodeler/pmblob.cpp +++ b/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 ) diff --git a/kpovmodeler/pmblob.h b/kpovmodeler/pmblob.h index 801e5338..6bdbef31 100644 --- a/kpovmodeler/pmblob.h +++ b/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 diff --git a/kpovmodeler/pmblobcylinder.cpp b/kpovmodeler/pmblobcylinder.cpp index 217a5743..114f4fa0 100644 --- a/kpovmodeler/pmblobcylinder.cpp +++ b/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 ) diff --git a/kpovmodeler/pmblobcylinder.h b/kpovmodeler/pmblobcylinder.h index 8959cee9..a07df1f6 100644 --- a/kpovmodeler/pmblobcylinder.h +++ b/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 */ diff --git a/kpovmodeler/pmblobcylinderedit.cpp b/kpovmodeler/pmblobcylinderedit.cpp index f3e702d0..836d7d72 100644 --- a/kpovmodeler/pmblobcylinderedit.cpp +++ b/kpovmodeler/pmblobcylinderedit.cpp @@ -26,8 +26,8 @@ #include <klocale.h> #include <tqcheckbox.h> -PMBlobCylinderEdit::PMBlobCylinderEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMBlobCylinderEdit::PMBlobCylinderEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmblobcylinderedit.h b/kpovmodeler/pmblobcylinderedit.h index dbe24134..103d5a4f 100644 --- a/kpovmodeler/pmblobcylinderedit.h +++ b/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 ); diff --git a/kpovmodeler/pmblobedit.cpp b/kpovmodeler/pmblobedit.cpp index b7dc2034..a38d9639 100644 --- a/kpovmodeler/pmblobedit.cpp +++ b/kpovmodeler/pmblobedit.cpp @@ -25,8 +25,8 @@ #include <tqcheckbox.h> #include <klocale.h> -PMBlobEdit::PMBlobEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMBlobEdit::PMBlobEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmblobedit.h b/kpovmodeler/pmblobedit.h index bada56da..9e389964 100644 --- a/kpovmodeler/pmblobedit.h +++ b/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 ); diff --git a/kpovmodeler/pmblobsphere.cpp b/kpovmodeler/pmblobsphere.cpp index fc8af594..70dcf06c 100644 --- a/kpovmodeler/pmblobsphere.cpp +++ b/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 ) diff --git a/kpovmodeler/pmblobsphere.h b/kpovmodeler/pmblobsphere.h index 4ae57e5c..e734e399 100644 --- a/kpovmodeler/pmblobsphere.h +++ b/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 diff --git a/kpovmodeler/pmblobsphereedit.cpp b/kpovmodeler/pmblobsphereedit.cpp index 6b569b93..6bf37b26 100644 --- a/kpovmodeler/pmblobsphereedit.cpp +++ b/kpovmodeler/pmblobsphereedit.cpp @@ -24,8 +24,8 @@ #include <tqlabel.h> #include <klocale.h> -PMBlobSphereEdit::PMBlobSphereEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMBlobSphereEdit::PMBlobSphereEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmblobsphereedit.h b/kpovmodeler/pmblobsphereedit.h index d4f18058..2e58bb06 100644 --- a/kpovmodeler/pmblobsphereedit.h +++ b/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 ); diff --git a/kpovmodeler/pmboundedby.cpp b/kpovmodeler/pmboundedby.cpp index 3e123d29..467129e8 100644 --- a/kpovmodeler/pmboundedby.cpp +++ b/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 ) diff --git a/kpovmodeler/pmboundedby.h b/kpovmodeler/pmboundedby.h index 997cef0f..256dc5f5 100644 --- a/kpovmodeler/pmboundedby.h +++ b/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 diff --git a/kpovmodeler/pmboundedbyedit.cpp b/kpovmodeler/pmboundedbyedit.cpp index db0b7b01..8a41fa52 100644 --- a/kpovmodeler/pmboundedbyedit.cpp +++ b/kpovmodeler/pmboundedbyedit.cpp @@ -23,8 +23,8 @@ #include <tqlabel.h> #include <klocale.h> -PMBoundedByEdit::PMBoundedByEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMBoundedByEdit::PMBoundedByEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmboundedbyedit.h b/kpovmodeler/pmboundedbyedit.h index f575fbb8..ce01d98d 100644 --- a/kpovmodeler/pmboundedbyedit.h +++ b/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 ); diff --git a/kpovmodeler/pmbox.cpp b/kpovmodeler/pmbox.cpp index 0f2bedb3..6ecc2c3c 100644 --- a/kpovmodeler/pmbox.cpp +++ b/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 ) diff --git a/kpovmodeler/pmbox.h b/kpovmodeler/pmbox.h index bf499042..7896b779 100644 --- a/kpovmodeler/pmbox.h +++ b/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 diff --git a/kpovmodeler/pmboxedit.cpp b/kpovmodeler/pmboxedit.cpp index c13da80d..6b6a2f2a 100644 --- a/kpovmodeler/pmboxedit.cpp +++ b/kpovmodeler/pmboxedit.cpp @@ -24,8 +24,8 @@ #include <tqlabel.h> #include <klocale.h> -PMBoxEdit::PMBoxEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMBoxEdit::PMBoxEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmboxedit.h b/kpovmodeler/pmboxedit.h index f9f0bf6d..9368bfbd 100644 --- a/kpovmodeler/pmboxedit.h +++ b/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 ); diff --git a/kpovmodeler/pmbumpmap.cpp b/kpovmodeler/pmbumpmap.cpp index ebdabab5..5c08040f 100644 --- a/kpovmodeler/pmbumpmap.cpp +++ b/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 ) diff --git a/kpovmodeler/pmbumpmap.h b/kpovmodeler/pmbumpmap.h index 64fb632f..ade1c1cd 100644 --- a/kpovmodeler/pmbumpmap.h +++ b/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 diff --git a/kpovmodeler/pmbumpmapedit.cpp b/kpovmodeler/pmbumpmapedit.cpp index 011e9873..5a4bf298 100644 --- a/kpovmodeler/pmbumpmapedit.cpp +++ b/kpovmodeler/pmbumpmapedit.cpp @@ -38,8 +38,8 @@ #include <kfiledialog.h> #include <kiconloader.h> -PMBumpMapEdit::PMBumpMapEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMBumpMapEdit::PMBumpMapEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmbumpmapedit.h b/kpovmodeler/pmbumpmapedit.h index 8404229b..0c29ca67 100644 --- a/kpovmodeler/pmbumpmapedit.h +++ b/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 ); /** */ diff --git a/kpovmodeler/pmcamera.cpp b/kpovmodeler/pmcamera.cpp index 697628a4..e65b8341 100644 --- a/kpovmodeler/pmcamera.cpp +++ b/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 ) diff --git a/kpovmodeler/pmcamera.h b/kpovmodeler/pmcamera.h index 1c93c718..e0d1206e 100644 --- a/kpovmodeler/pmcamera.h +++ b/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" ); } diff --git a/kpovmodeler/pmcameraedit.cpp b/kpovmodeler/pmcameraedit.cpp index 1376efb9..23db4104 100644 --- a/kpovmodeler/pmcameraedit.cpp +++ b/kpovmodeler/pmcameraedit.cpp @@ -30,8 +30,8 @@ #include <kmessagebox.h> -PMCameraEdit::PMCameraEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMCameraEdit::PMCameraEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmcameraedit.h b/kpovmodeler/pmcameraedit.h index 33b9c39b..1ca18eb7 100644 --- a/kpovmodeler/pmcameraedit.h +++ b/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 ); diff --git a/kpovmodeler/pmclippedby.cpp b/kpovmodeler/pmclippedby.cpp index 529e0962..b1499d0c 100644 --- a/kpovmodeler/pmclippedby.cpp +++ b/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 ) diff --git a/kpovmodeler/pmclippedby.h b/kpovmodeler/pmclippedby.h index 6c9d21a1..252a7db2 100644 --- a/kpovmodeler/pmclippedby.h +++ b/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 diff --git a/kpovmodeler/pmclippedbyedit.cpp b/kpovmodeler/pmclippedbyedit.cpp index 486b58f2..8afa0285 100644 --- a/kpovmodeler/pmclippedbyedit.cpp +++ b/kpovmodeler/pmclippedbyedit.cpp @@ -23,8 +23,8 @@ #include <tqlabel.h> #include <klocale.h> -PMClippedByEdit::PMClippedByEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMClippedByEdit::PMClippedByEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmclippedbyedit.h b/kpovmodeler/pmclippedbyedit.h index 9050f406..53eef1d8 100644 --- a/kpovmodeler/pmclippedbyedit.h +++ b/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 ); diff --git a/kpovmodeler/pmcoloredit.cpp b/kpovmodeler/pmcoloredit.cpp index 1c282f78..f34ee47d 100644 --- a/kpovmodeler/pmcoloredit.cpp +++ b/kpovmodeler/pmcoloredit.cpp @@ -24,8 +24,8 @@ #include <tqcolor.h> #include <kdialog.h> -PMColorEdit::PMColorEdit( bool filterAndTransmit, TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +PMColorEdit::PMColorEdit( bool filterAndTransmit, TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { m_bFilterAndTransmit = filterAndTransmit; diff --git a/kpovmodeler/pmcoloredit.h b/kpovmodeler/pmcoloredit.h index 4ef27e00..3be1e347 100644 --- a/kpovmodeler/pmcoloredit.h +++ b/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 diff --git a/kpovmodeler/pmcolorsettings.cpp b/kpovmodeler/pmcolorsettings.cpp index fbcb2066..e8518312 100644 --- a/kpovmodeler/pmcolorsettings.cpp +++ b/kpovmodeler/pmcolorsettings.cpp @@ -25,8 +25,8 @@ #include <kcolorbutton.h> #include <klocale.h> -PMColorSettings::PMColorSettings( TQWidget* tqparent, const char* name ) - : PMSettingsDialogPage( tqparent, name ) +PMColorSettings::PMColorSettings( TQWidget* parent, const char* name ) + : PMSettingsDialogPage( parent, name ) { TQHBoxLayout* htqlayout; TQVBoxLayout* vtqlayout; diff --git a/kpovmodeler/pmcolorsettings.h b/kpovmodeler/pmcolorsettings.h index 703bf6cf..7ceb2ce7 100644 --- a/kpovmodeler/pmcolorsettings.h +++ b/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( ); /** */ diff --git a/kpovmodeler/pmcomment.cpp b/kpovmodeler/pmcomment.cpp index 7d12dfbc..3f659682 100644 --- a/kpovmodeler/pmcomment.cpp +++ b/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 ) diff --git a/kpovmodeler/pmcomment.h b/kpovmodeler/pmcomment.h index 64514452..832863bc 100644 --- a/kpovmodeler/pmcomment.h +++ b/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" ); } /** */ diff --git a/kpovmodeler/pmcommentedit.cpp b/kpovmodeler/pmcommentedit.cpp index b9f5daac..92cdbfa3 100644 --- a/kpovmodeler/pmcommentedit.cpp +++ b/kpovmodeler/pmcommentedit.cpp @@ -23,8 +23,8 @@ #include <tqmultilineedit.h> #include <kglobalsettings.h> -PMCommentEdit::PMCommentEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMCommentEdit::PMCommentEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmcommentedit.h b/kpovmodeler/pmcommentedit.h index da44246b..4b5bedf9 100644 --- a/kpovmodeler/pmcommentedit.h +++ b/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 ); diff --git a/kpovmodeler/pmcompositeobject.cpp b/kpovmodeler/pmcompositeobject.cpp index e9369ea4..3699e716 100644 --- a/kpovmodeler/pmcompositeobject.cpp +++ b/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; diff --git a/kpovmodeler/pmcompositeobject.h b/kpovmodeler/pmcompositeobject.h index 0d7ae6df..50298236 100644 --- a/kpovmodeler/pmcompositeobject.h +++ b/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 ); diff --git a/kpovmodeler/pmcone.cpp b/kpovmodeler/pmcone.cpp index 3a90d131..014fbc0f 100644 --- a/kpovmodeler/pmcone.cpp +++ b/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 ) diff --git a/kpovmodeler/pmcone.h b/kpovmodeler/pmcone.h index aa452b64..25dacfd5 100644 --- a/kpovmodeler/pmcone.h +++ b/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 */ diff --git a/kpovmodeler/pmconeedit.cpp b/kpovmodeler/pmconeedit.cpp index 006add43..75a07855 100644 --- a/kpovmodeler/pmconeedit.cpp +++ b/kpovmodeler/pmconeedit.cpp @@ -26,8 +26,8 @@ #include <klocale.h> #include <tqcheckbox.h> -PMConeEdit::PMConeEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMConeEdit::PMConeEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmconeedit.h b/kpovmodeler/pmconeedit.h index d5210124..88c2601a 100644 --- a/kpovmodeler/pmconeedit.h +++ b/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 ); diff --git a/kpovmodeler/pmcsg.cpp b/kpovmodeler/pmcsg.cpp index c8316a53..66532ac6 100644 --- a/kpovmodeler/pmcsg.cpp +++ b/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 ) diff --git a/kpovmodeler/pmcsg.h b/kpovmodeler/pmcsg.h index 3424a6c7..36184883 100644 --- a/kpovmodeler/pmcsg.h +++ b/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 diff --git a/kpovmodeler/pmcsgedit.cpp b/kpovmodeler/pmcsgedit.cpp index bdbbe3da..014eb09b 100644 --- a/kpovmodeler/pmcsgedit.cpp +++ b/kpovmodeler/pmcsgedit.cpp @@ -24,8 +24,8 @@ #include <tqcombobox.h> #include <klocale.h> -PMCSGEdit::PMCSGEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMCSGEdit::PMCSGEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmcsgedit.h b/kpovmodeler/pmcsgedit.h index 1ec5d205..9e371a40 100644 --- a/kpovmodeler/pmcsgedit.h +++ b/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 ); diff --git a/kpovmodeler/pmcylinder.cpp b/kpovmodeler/pmcylinder.cpp index b595d6e1..c449189d 100644 --- a/kpovmodeler/pmcylinder.cpp +++ b/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 ) diff --git a/kpovmodeler/pmcylinder.h b/kpovmodeler/pmcylinder.h index 66174d59..cae308fe 100644 --- a/kpovmodeler/pmcylinder.h +++ b/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 */ diff --git a/kpovmodeler/pmcylinderedit.cpp b/kpovmodeler/pmcylinderedit.cpp index b471cb29..b8741ae7 100644 --- a/kpovmodeler/pmcylinderedit.cpp +++ b/kpovmodeler/pmcylinderedit.cpp @@ -26,8 +26,8 @@ #include <klocale.h> #include <tqcheckbox.h> -PMCylinderEdit::PMCylinderEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMCylinderEdit::PMCylinderEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmcylinderedit.h b/kpovmodeler/pmcylinderedit.h index 9b25ec2a..0444c120 100644 --- a/kpovmodeler/pmcylinderedit.h +++ b/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 ); diff --git a/kpovmodeler/pmdeclare.cpp b/kpovmodeler/pmdeclare.cpp index 0fd7d115..089447bc 100644 --- a/kpovmodeler/pmdeclare.cpp +++ b/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 ) diff --git a/kpovmodeler/pmdeclare.h b/kpovmodeler/pmdeclare.h index 05782866..69915218 100644 --- a/kpovmodeler/pmdeclare.h +++ b/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 */ diff --git a/kpovmodeler/pmdeclareedit.cpp b/kpovmodeler/pmdeclareedit.cpp index 3693bf6d..60446a53 100644 --- a/kpovmodeler/pmdeclareedit.cpp +++ b/kpovmodeler/pmdeclareedit.cpp @@ -33,8 +33,8 @@ #include <klocale.h> #include <kmessagebox.h> -PMDeclareEdit::PMDeclareEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMDeclareEdit::PMDeclareEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; m_pSelectedObject = 0; diff --git a/kpovmodeler/pmdeclareedit.h b/kpovmodeler/pmdeclareedit.h index 0b40eb2a..b6d6afe9 100644 --- a/kpovmodeler/pmdeclareedit.h +++ b/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 ); diff --git a/kpovmodeler/pmdeletecommand.cpp b/kpovmodeler/pmdeletecommand.cpp index aa7497b2..1afb81fa 100644 --- a/kpovmodeler/pmdeletecommand.cpp +++ b/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( ) - && !tqparent->mementoCreated( ) ) - tqparent->createMemento( ); - tqparent->takeChild( info->deletedObject( ) ); + if( parent->dataChangeOnInsertRemove( ) + && !parent->mementoCreated( ) ) + parent->createMemento( ); + parent->takeChild( info->deletedObject( ) ); } if( m_firstExecution ) { for( it.toLast( ); it.current( ); --it ) { - tqparent = it.current( )->tqparent( ); - if( tqparent->mementoCreated( ) ) - m_dataChanges.append( tqparent->takeMemento( ) ); + parent = it.current( )->parent( ); + if( parent->mementoCreated( ) ) + 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; diff --git a/kpovmodeler/pmdeletecommand.h b/kpovmodeler/pmdeletecommand.h index 4c384e1f..d11cf348 100644 --- a/kpovmodeler/pmdeletecommand.h +++ b/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 */ diff --git a/kpovmodeler/pmdensity.cpp b/kpovmodeler/pmdensity.cpp index 5743a5b4..a742d514 100644 --- a/kpovmodeler/pmdensity.cpp +++ b/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 ); } diff --git a/kpovmodeler/pmdensity.h b/kpovmodeler/pmdensity.h index ca32ac99..c194f846 100644 --- a/kpovmodeler/pmdensity.h +++ b/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" ); } diff --git a/kpovmodeler/pmdensityedit.cpp b/kpovmodeler/pmdensityedit.cpp index 8213d27c..407a4f80 100644 --- a/kpovmodeler/pmdensityedit.cpp +++ b/kpovmodeler/pmdensityedit.cpp @@ -25,8 +25,8 @@ #include <klocale.h> -PMDensityEdit::PMDensityEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMDensityEdit::PMDensityEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmdensityedit.h b/kpovmodeler/pmdensityedit.h index a8241117..514ccaf9 100644 --- a/kpovmodeler/pmdensityedit.h +++ b/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 ); diff --git a/kpovmodeler/pmdetailobjectedit.cpp b/kpovmodeler/pmdetailobjectedit.cpp index 0fbd3a8a..09b53cbd 100644 --- a/kpovmodeler/pmdetailobjectedit.cpp +++ b/kpovmodeler/pmdetailobjectedit.cpp @@ -23,8 +23,8 @@ #include <tqcombobox.h> #include <klocale.h> -PMDetailObjectEdit::PMDetailObjectEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMDetailObjectEdit::PMDetailObjectEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmdetailobjectedit.h b/kpovmodeler/pmdetailobjectedit.h index e6224d59..d270c446 100644 --- a/kpovmodeler/pmdetailobjectedit.h +++ b/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 ); diff --git a/kpovmodeler/pmdialogeditbase.cpp b/kpovmodeler/pmdialogeditbase.cpp index 542d3e20..9b575fd8 100644 --- a/kpovmodeler/pmdialogeditbase.cpp +++ b/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 ) - : TQWidget( tqparent, name ) +PMDialogEditBase::PMDialogEditBase( TQWidget* parent, const char* 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( ) ) diff --git a/kpovmodeler/pmdialogeditbase.h b/kpovmodeler/pmdialogeditbase.h index 04a3dad7..77c37409 100644 --- a/kpovmodeler/pmdialogeditbase.h +++ b/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 */ diff --git a/kpovmodeler/pmdialogview.cpp b/kpovmodeler/pmdialogview.cpp index 1df22c26..0a7f372e 100644 --- a/kpovmodeler/pmdialogview.cpp +++ b/kpovmodeler/pmdialogview.cpp @@ -39,8 +39,8 @@ #include <tqscrollview.h> #include <tqlabel.h> -PMDialogEditContent::PMDialogEditContent( TQWidget* tqparent, const char* name ) |