diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-10 22:19:39 +0000 |
| commit | e7366c97c998679efa80cf61c88e64a11a3d3c33 (patch) | |
| tree | a161d2940165f6cc47c05f0271ad8e5f64ffe6e8 | |
| parent | da4be7880ff1de6415ab6256afd2514e64f5fa2e (diff) | |
| download | tdegraphics-e7366c97c998679efa80cf61c88e64a11a3d3c33.tar.gz tdegraphics-e7366c97c998679efa80cf61c88e64a11a3d3c33.zip | |
rename the following methods:
tqparent parent
tqmask mask
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
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 ) - : TQScrollView( tqparent, name ) +PMDialogEditContent::PMDialogEditContent( TQWidget* parent, const char* name ) + : TQScrollView( parent, name ) { m_pContents = 0; setVScrollBarMode( AlwaysOff ); @@ -111,8 +111,8 @@ void PMDialogEditContent::resizeEvent( TQResizeEvent* /* ev */ ) calculateSize( ); } -PMDialogView::PMDialogView( PMPart* part, TQWidget* tqparent, const char* name ) - : PMViewBase( tqparent, name ) +PMDialogView::PMDialogView( PMPart* part, TQWidget* parent, const char* name ) + : PMViewBase( parent, name ) { m_pDisplayedWidget = 0; m_unsavedData = false; diff --git a/kpovmodeler/pmdialogview.h b/kpovmodeler/pmdialogview.h index 0b6209c3..d4e2f47a 100644 --- a/kpovmodeler/pmdialogview.h +++ b/kpovmodeler/pmdialogview.h @@ -45,7 +45,7 @@ class PMDialogEditContent : public TQScrollView Q_OBJECT TQ_OBJECT public: - PMDialogEditContent( TQWidget* tqparent, const char* name = 0 ); + PMDialogEditContent( TQWidget* parent, const char* name = 0 ); void setContents( TQWidget* wid ); void calculateSize( ); protected: @@ -69,7 +69,7 @@ public: /** * Creates a new PMDialogView widget */ - PMDialogView( PMPart* part, TQWidget* tqparent, const char* name = 0 ); + PMDialogView( PMPart* part, TQWidget* parent, const char* name = 0 ); /** * Deletes the widget */ @@ -156,9 +156,9 @@ public: virtual TQString viewType( ) const { return TQString( "dialogview" ); } virtual TQString description( ) const; virtual TQString iconName( ) const { return TQString( "pmdialogview" ); } - virtual PMViewBase* newInstance( TQWidget* tqparent, PMPart* part ) const + virtual PMViewBase* newInstance( TQWidget* parent, PMPart* part ) const { - return new PMDialogView( part, tqparent ); + return new PMDialogView( part, parent ); } }; diff --git a/kpovmodeler/pmdisc.cpp b/kpovmodeler/pmdisc.cpp index 4a526288..6f7bac55 100644 --- a/kpovmodeler/pmdisc.cpp +++ b/kpovmodeler/pmdisc.cpp @@ -176,9 +176,9 @@ void PMDisc::setHoleRadius( double hradius ) } } -PMDialogEditBase* PMDisc::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMDisc::editWidget( TQWidget* parent ) const { - return new PMDiscEdit( tqparent ); + return new PMDiscEdit( parent ); } void PMDisc::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmdisc.h b/kpovmodeler/pmdisc.h index 482e5e1d..b56e2175 100644 --- a/kpovmodeler/pmdisc.h +++ b/kpovmodeler/pmdisc.h @@ -67,7 +67,7 @@ public: /** * Returns a new @ref PMDiscEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view and dialog view */ diff --git a/kpovmodeler/pmdiscedit.cpp b/kpovmodeler/pmdiscedit.cpp index 6b06207d..e960f869 100644 --- a/kpovmodeler/pmdiscedit.cpp +++ b/kpovmodeler/pmdiscedit.cpp @@ -27,8 +27,8 @@ #include <klocale.h> #include <kmessagebox.h> -PMDiscEdit::PMDiscEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMDiscEdit::PMDiscEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmdiscedit.h b/kpovmodeler/pmdiscedit.h index 73466f32..2741c1df 100644 --- a/kpovmodeler/pmdiscedit.h +++ b/kpovmodeler/pmdiscedit.h @@ -37,9 +37,9 @@ class PMDiscEdit : public PMGraphicalObjectEdit typedef PMGraphicalObjectEdit Base; public: /** - * Creates a PMPlaneEdit with tqparent and name + * Creates a PMPlaneEdit with parent and name */ - PMDiscEdit( TQWidget* tqparent, const char* name = 0 ); + PMDiscEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmdockwidget.cpp b/kpovmodeler/pmdockwidget.cpp index b964f671..575e0af0 100644 --- a/kpovmodeler/pmdockwidget.cpp +++ b/kpovmodeler/pmdockwidget.cpp @@ -134,8 +134,8 @@ public: * * @author Max Judin. */ -PMDockMainWindow::PMDockMainWindow( TQWidget* tqparent, const char *name, WFlags f) -:KMainWindow( tqparent, name, f ) +PMDockMainWindow::PMDockMainWindow( TQWidget* parent, const char *name, WFlags f) +:KMainWindow( parent, name, f ) { TQString new_name = TQString(name) + TQString("_DockManager"); dockManager = new PMDockManager( this, new_name.latin1() ); @@ -256,7 +256,7 @@ void PMDockMainWindow::setMainDockWidget( PMDockWidget* mdw ) void PMDockMainWindow::setView( TQWidget *view ) { if ( view->isA("PMDockWidget") ){ - if ( TQT_BASE_OBJECT(view->tqparent()) != TQT_BASE_OBJECT(this) ) ((PMDockWidget*)view)->applyToWidget( this ); + if ( TQT_BASE_OBJECT(view->parent()) != TQT_BASE_OBJECT(this) ) ((PMDockWidget*)view)->applyToWidget( this ); } #ifndef NO_KDE2 @@ -266,9 +266,9 @@ void PMDockMainWindow::setView( TQWidget *view ) #endif } -PMDockWidget* PMDockMainWindow::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent, const TQString& strCaption, const TQString& strTabPageLabel) +PMDockWidget* PMDockMainWindow::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent, const TQString& strCaption, const TQString& strTabPageLabel) { - return new PMDockWidget( dockManager, name.latin1(), pixmap, tqparent, strCaption, strTabPageLabel ); + return new PMDockWidget( dockManager, name.latin1(), pixmap, parent, strCaption, strTabPageLabel ); } void PMDockMainWindow::makeDockVisible( PMDockWidget* dock ) @@ -319,15 +319,15 @@ void PMDockMainWindow::slotDockWidgetUndocked() } /*************************************************************************/ -PMDockWidgetAbstractHeaderDrag::PMDockWidgetAbstractHeaderDrag( PMDockWidgetAbstractHeader* tqparent, PMDockWidget* dock, const char* name ) -:TQFrame( tqparent, name ) +PMDockWidgetAbstractHeaderDrag::PMDockWidgetAbstractHeaderDrag( PMDockWidgetAbstractHeader* parent, PMDockWidget* dock, const char* name ) +:TQFrame( parent, name ) { dw = dock; installEventFilter( dock->dockManager() ); } /*************************************************************************/ -PMDockWidgetHeaderDrag::PMDockWidgetHeaderDrag( PMDockWidgetAbstractHeader* tqparent, PMDockWidget* dock, const char* name ) -:PMDockWidgetAbstractHeaderDrag( tqparent, dock, name ) +PMDockWidgetHeaderDrag::PMDockWidgetHeaderDrag( PMDockWidgetAbstractHeader* parent, PMDockWidget* dock, const char* name ) +:PMDockWidgetAbstractHeaderDrag( parent, dock, name ) { } @@ -342,28 +342,28 @@ void PMDockWidgetHeaderDrag::paintEvent( TQPaintEvent* ) paint.end(); } /*************************************************************************/ -PMDockWidgetAbstractHeader::PMDockWidgetAbstractHeader( PMDockWidget* tqparent, const char* name ) -:TQFrame( tqparent, name ) +PMDockWidgetAbstractHeader::PMDockWidgetAbstractHeader( PMDockWidget* parent, const char* name ) +:TQFrame( parent, name ) { } /*************************************************************************/ -PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* tqparent, const char* name ) -:PMDockWidgetAbstractHeader( tqparent, name ) +PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* parent, const char* name ) +:PMDockWidgetAbstractHeader( parent, name ) { tqlayout = new TQHBoxLayout( this ); tqlayout->setResizeMode( TQLayout::Minimum ); - drag = new PMDockWidgetHeaderDrag( this, tqparent ); + drag = new PMDockWidgetHeaderDrag( this, parent ); closeButton = new PMDockButton_Private( this, "DockCloseButton" ); closeButton->setPixmap( const_cast< const char** >(close_xpm) ); int buttonWidth = 9, buttonHeight = 9; closeButton->setFixedSize(buttonWidth,buttonHeight); - connect( closeButton, TQT_SIGNAL(clicked()), tqparent, TQT_SIGNAL(headerCloseButtonClicked())); + connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerCloseButtonClicked())); // MODIFICATION (zehender) // The shell will delete the widget // undock is unnecessary - // connect( closeButton, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(undock())); + // connect( closeButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(undock())); stayButton = new PMDockButton_Private( this, "DockStayButton" ); stayButton->setToggleButton( true ); @@ -375,8 +375,8 @@ PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* tqparent, const char* name dockbackButton = new PMDockButton_Private( this, "DockbackButton" ); dockbackButton->setPixmap( const_cast< const char** >(dockback_xpm)); dockbackButton->setFixedSize(buttonWidth,buttonHeight); - connect( dockbackButton, TQT_SIGNAL(clicked()), tqparent, TQT_SIGNAL(headerDockbackButtonClicked())); - connect( dockbackButton, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(dockBack())); + connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SIGNAL(headerDockbackButtonClicked())); + connect( dockbackButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(dockBack())); // MODIFICATION (zehender) // Add a button to undock the widget and dock it as top level @@ -384,7 +384,7 @@ PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* tqparent, const char* name toDesktopButton = new PMDockButton_Private( this, "ToDesktopButton" ); toDesktopButton->setPixmap( const_cast< const char** >(todesktop_xpm)); toDesktopButton->setFixedSize(buttonWidth,buttonHeight); - connect( toDesktopButton, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(toDesktop())); + connect( toDesktopButton, TQT_SIGNAL(clicked()), parent, TQT_SLOT(toDesktop())); tqlayout->addWidget( drag ); tqlayout->addWidget( dockbackButton ); @@ -398,7 +398,7 @@ PMDockWidgetHeader::PMDockWidgetHeader( PMDockWidget* tqparent, const char* name void PMDockWidgetHeader::setTopLevel( bool isTopLevel ) { if ( isTopLevel ){ - PMDockWidget* par = (PMDockWidget*)tqparent(); + PMDockWidget* par = (PMDockWidget*)parent(); if( par) { if( par->isDockBackPossible()) dockbackButton->show(); @@ -459,18 +459,18 @@ void PMDockWidgetHeader::setDragEnabled(bool b) #ifndef NO_KDE2 void PMDockWidgetHeader::saveConfig( KConfig* c ) { - c->writeEntry( TQString("%1%2").tqarg(tqparent()->name()).tqarg(":stayButton"), stayButton->isOn() ); + c->writeEntry( TQString("%1%2").tqarg(parent()->name()).tqarg(":stayButton"), stayButton->isOn() ); } void PMDockWidgetHeader::loadConfig( KConfig* c ) { - setDragEnabled( !c->readBoolEntry( TQString("%1%2").tqarg(tqparent()->name()).tqarg(":stayButton"), false ) ); + setDragEnabled( !c->readBoolEntry( TQString("%1%2").tqarg(parent()->name()).tqarg(":stayButton"), false ) ); } #endif /*************************************************************************/ -PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const TQPixmap &pixmap, TQWidget* tqparent, const TQString& strCaption, const TQString& strTabPageLabel, WFlags f) -: TQWidget( tqparent, name, f ) +PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const TQPixmap &pixmap, TQWidget* parent, const TQString& strCaption, const TQString& strTabPageLabel, WFlags f) +: TQWidget( parent, name, f ) ,formerBrotherDockWidget(0L) ,currentDockPos(DockNone) ,formerDockPos(DockNone) @@ -479,7 +479,7 @@ PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const { d = new PMDockWidgetPrivate(); // create private data - d->_parent = tqparent; + d->_parent = parent; tqlayout = new TQVBoxLayout( this ); tqlayout->setResizeMode( TQLayout::Minimum ); @@ -510,7 +510,7 @@ PMDockWidget::PMDockWidget( PMDockManager* dockManager, const char* name, const widget = 0L; TQObject::connect(this, TQT_SIGNAL(hasUndocked()), manager->main, TQT_SLOT(slotDockWidgetUndocked()) ); - applyToWidget( tqparent, TQPoint(0,0) ); + applyToWidget( parent, TQPoint(0,0) ); } void PMDockWidget::slotSetCaption( const TQString& str ) @@ -558,8 +558,8 @@ void PMDockWidget::setEnableDocking( int pos ) void PMDockWidget::updateHeader() { - if ( tqparent() ){ - if ( (TQT_BASE_OBJECT(tqparent()) == TQT_BASE_OBJECT(manager->main)) || isGroup || (eDocking == PMDockWidget::DockNone) ){ + if ( parent() ){ + if ( (TQT_BASE_OBJECT(parent()) == TQT_BASE_OBJECT(manager->main)) || isGroup || (eDocking == PMDockWidget::DockNone) ){ header->hide(); } else { header->setTopLevel( false ); @@ -573,7 +573,7 @@ void PMDockWidget::updateHeader() void PMDockWidget::applyToWidget( TQWidget* s, const TQPoint& p ) { - if ( TQT_BASE_OBJECT(tqparent()) != TQT_BASE_OBJECT(s) ) + if ( TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(s) ) { hide(); reparent(s, 0, TQPoint(0,0), false); @@ -608,11 +608,11 @@ void PMDockWidget::applyToWidget( TQWidget* s, const TQPoint& p ) void PMDockWidget::show() { - if ( tqparent() || manager->main->isVisible() ) - if ( !tqparent() ){ + if ( parent() || manager->main->isVisible() ) + if ( !parent() ){ emit manager->setDockDefaultPos( this ); emit setDockDefaultPos(); - if ( tqparent() ){ + if ( parent() ){ makeDockVisible(); } else { TQWidget::show(); @@ -632,9 +632,9 @@ void PMDockWidget::setDockWindowType (NET::WindowType windowType) #endif -void PMDockWidget::setDockWindowTransient (TQWidget *tqparent, bool transientEnabled) +void PMDockWidget::setDockWindowTransient (TQWidget *parent, bool transientEnabled) { - d->_parent = tqparent; + d->_parent = parent; d->transient = transientEnabled; applyToWidget( parentWidget(), TQPoint(0,0) ); } @@ -664,8 +664,8 @@ bool PMDockWidget::event( TQEvent* pevent ) break; case TQEvent::CaptionChange: if ( parentWidget() ){ - if ( tqparent()->inherits("PMDockSplitter") ){ - ((PMDockSplitter*)(tqparent()))->updateName(); + if ( parent()->inherits("PMDockSplitter") ){ + ((PMDockSplitter*)(parent()))->updateName(); } if ( parentDockTabGroup() ){ setDockTabName( parentDockTabGroup() ); @@ -686,7 +686,7 @@ bool PMDockWidget::event( TQEvent* pevent ) } #undef KeyPress bool processed = TQWidget::event( pevent ); - if( pevent->type( ) == TQEvent::AccelOverride && !processed && !tqparent( ) ){ + if( pevent->type( ) == TQEvent::AccelOverride && !processed && !parent( ) ){ // MODIFICATION (zehender) // floating widget, post event to main window processed = tqApp->sendEvent( manager->dockMainWidget( ), pevent ); @@ -702,7 +702,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP bool succes = true; // tested flag // do not dock into a floating widget - if( target && !target->tqparent( ) ) + if( target && !target->parent( ) ) target = 0; // check allowed this dock submit this operations @@ -715,18 +715,18 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP succes = false; } - if ( tqparent() && !tqparent()->inherits("PMDockSplitter") && !parentDockTabGroup() ){ + if ( parent() && !parent()->inherits("PMDockSplitter") && !parentDockTabGroup() ){ succes = false; } // if docking to a tab group, and position is not center - // dock to the tqparent of the tab group + // dock to the parent of the tab group if( target && ( dockPos != PMDockWidget::DockCenter ) && ( dockPos != PMDockWidget::DockNone ) ) { TQWidget* pdt = target->parentDockTabGroup( ); if( pdt ) - return manualDock( ( PMDockWidget* ) ( pdt->tqparent( ) ), + return manualDock( ( PMDockWidget* ) ( pdt->parent( ) ), dockPos, spliPos, pos, check, tabIndex ); } @@ -771,7 +771,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP currentDockPos = PMDockWidget::DockCenter; emit manager->change(); - return (PMDockWidget*)parentTab->tqparent(); + return (PMDockWidget*)parentTab->parent(); } // MODIFICATION (Zehender): @@ -930,7 +930,7 @@ PMDockWidget* PMDockWidget::manualDock( PMDockWidget* target, DockPosition dockP PMDockTabGroup* PMDockWidget::parentDockTabGroup() const { - if ( !tqparent() ) return 0L; + if ( !parent() ) return 0L; TQWidget* candidate = parentWidget()->parentWidget(); if ( candidate && candidate->inherits("PMDockTabGroup") ) return (PMDockTabGroup*)candidate; return 0L; @@ -980,8 +980,8 @@ void PMDockWidget::undock() lastTab->applyToWidget( 0L ); lastTab->move( parentTab->mapToGlobal(parentTab->frameGeometry().topLeft()) ); - // PMDockTabGroup always have a tqparent that is a PMDockWidget - PMDockWidget* parentOfTab = (PMDockWidget*)parentTab->tqparent(); + // PMDockTabGroup always have a parent that is a PMDockWidget + PMDockWidget* parentOfTab = (PMDockWidget*)parentTab->parent(); delete parentTab; // PMDockTabGroup TQWidget* parentOfDockWidget = parentOfTab->parentWidget(); @@ -994,13 +994,13 @@ void PMDockWidget::undock() split->deactivate(); if ( split->getFirst() == parentOfTab ){ split->activate( lastTab ); - if ( ((PMDockWidget*)split->tqparent())->splitterOrientation ==Qt::Vertical ) + if ( ((PMDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical ) emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockLeft ); else emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockTop ); } else { split->activate( 0L, lastTab ); - if ( ((PMDockWidget*)split->tqparent())->splitterOrientation ==Qt::Vertical ) + if ( ((PMDockWidget*)split->parent())->splitterOrientation ==Qt::Vertical ) emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockRight ); else emit ((PMDockWidget*)split->getAnother(parentOfTab))->docking( parentOfTab, PMDockWidget::DockBottom ); @@ -1081,7 +1081,7 @@ void PMDockWidget::setWidget( TQWidget* mw ) { if ( !mw ) return; - if ( TQT_BASE_OBJECT(mw->tqparent()) != TQT_BASE_OBJECT(this) ){ + if ( TQT_BASE_OBJECT(mw->parent()) != TQT_BASE_OBJECT(this) ){ mw->reparent(this, 0, TQPoint(0,0), false); } @@ -1111,20 +1111,20 @@ void PMDockWidget::setDockTabName( PMDockTabGroup* tab ) tab->parentWidget()->setCaption( listOfCaption ); tab->parentWidget()->tqrepaint( false ); // PMDockWidget->tqrepaint - if ( tab->parentWidget()->tqparent() ) - if ( tab->parentWidget()->tqparent()->inherits("PMDockSplitter") ) - ((PMDockSplitter*)(tab->parentWidget()->tqparent()))->updateName(); + if ( tab->parentWidget()->parent() ) + if ( tab->parentWidget()->parent()->inherits("PMDockSplitter") ) + ((PMDockSplitter*)(tab->parentWidget()->parent()))->updateName(); } bool PMDockWidget::mayBeHide() const { - bool f = (TQT_BASE_OBJECT(tqparent()) != TQT_BASE_OBJECT(manager->main)); + bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main)); return ( !isGroup && !isTabGroup && f && isVisible() && ( eDocking != (int)PMDockWidget::DockNone ) ); } bool PMDockWidget::mayBeShow() const { - bool f = (TQT_BASE_OBJECT(tqparent()) != TQT_BASE_OBJECT(manager->main)); + bool f = (TQT_BASE_OBJECT(parent()) != TQT_BASE_OBJECT(manager->main)); return ( !isGroup && !isTabGroup && f && !isVisible() ); } @@ -1157,7 +1157,7 @@ void PMDockWidget::makeDockVisible() p->show(); p = p->parentWidget(); } - if( tqparent() == 0L) // is undocked + if( parent() == 0L) // is undocked dockBack(); show(); } @@ -1199,7 +1199,7 @@ void PMDockWidget::dockBack() // else dockback to the dockmainwindow (default behaviour) manualDock( ((PMDockMainWindow*)manager->main)->getMainDockWidget(), formerDockPos, d->splitPosInPercent, TQPoint(0,0), false, d->index); formerBrotherDockWidget = 0L; - if (tqparent()) + if (parent()) makeDockVisible(); } @@ -1549,7 +1549,7 @@ void PMDockManager::findFloatingWidgets( TQPtrList<PMDockWidget>& l ) TQObjectListIt it( *childDock ); for( ; it.current( ); ++it ) if( it.current( )->inherits( "PMDockWidget" ) && - !it.current( )->tqparent( ) ) + !it.current( )->parent( ) ) l.append( ( PMDockWidget* ) it.current( ) ); } @@ -1588,7 +1588,7 @@ void PMDockManager::dragMove( PMDockWidget* dw, TQPoint pos ) int w = r.width() / 3; int h = r.height() / 3; - PMDockMainWindow* mw = ( PMDockMainWindow* ) tqparent( ); + PMDockMainWindow* mw = ( PMDockMainWindow* ) parent( ); TQWidget* cw = mw->centralWidget( ); TQPoint cwp = cw->mapToGlobal( TQPoint( 0, 0 ) ); int cwh = cw->height( ); @@ -1660,7 +1660,7 @@ void PMDockManager::drop() drawDragRectangle(); // only the old rect will be deleted return; } - if ( !currentMoveWidget && !currentDragWidget->tqparent() ) { + if ( !currentMoveWidget && !currentDragWidget->parent() ) { currentDragWidget->move( TQCursor::pos() - d->dragOffset ); } else { @@ -1800,7 +1800,7 @@ void PMDockManager::writeConfig(TQDomElement &base) TQObjectListIt it(*childDock); PMDockWidget *obj1; while ( (obj1=(PMDockWidget*)it.current()) ) { - if ( TQT_BASE_OBJECT(obj1->tqparent()) == TQT_BASE_OBJECT(main) ) + if ( TQT_BASE_OBJECT(obj1->parent()) == TQT_BASE_OBJECT(main) ) mainWidgetStr = TQString::tqfromLatin1(obj1->name()); nList.append(obj1->name()); ++it; @@ -1842,8 +1842,8 @@ void PMDockManager::writeConfig(TQDomElement &base) } groupEl.appendChild(createStringEntry(doc, "name", TQString::tqfromLatin1(obj->name()))); - groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->tqparent())); - if ( !obj->tqparent() ) { + groupEl.appendChild(createBoolEntry(doc, "hasParent", obj->parent())); + if ( !obj->parent() ) { groupEl.appendChild(createRectEntry(doc, "geometry", TQRect(main->frameGeometry().topLeft(), main->size()))); groupEl.appendChild(createBoolEntry(doc, "visible", obj->isVisible())); } @@ -1891,7 +1891,7 @@ void PMDockManager::readConfig(TQDomElement &base) PMDockWidget *obj1; while ( (obj1=(PMDockWidget*)it.current()) ) { if ( !obj1->isGroup && !obj1->isTabGroup ) { - if ( obj1->tqparent() ) + if ( obj1->parent() ) obj1->undock(); else obj1->hide(); @@ -2020,7 +2020,7 @@ void PMDockManager::writeConfig( KConfig* c, TQString group ) ++it; //debug(" +Add subdock %s", obj->name()); nList.append( obj->name() ); - if ( TQT_BASE_OBJECT(obj->tqparent()) == TQT_BASE_OBJECT(main) ) + if ( TQT_BASE_OBJECT(obj->parent()) == TQT_BASE_OBJECT(main) ) c->writeEntry( "Main:view", obj->name() ); } @@ -2037,12 +2037,12 @@ void PMDockManager::writeConfig( KConfig* c, TQString group ) if ( findList.find( obj->firstName.latin1() ) != -1 && findList.find( obj->lastName.latin1() ) != -1 ){ c->writeEntry( cname+":type", "GROUP"); - if ( !obj->tqparent() ){ - c->writeEntry( cname+":tqparent", "___null___"); + if ( !obj->parent() ){ + c->writeEntry( cname+":parent", "___null___"); c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); c->writeEntry( cname+":visible", obj->isVisible()); } else { - c->writeEntry( cname+":tqparent", "yes"); + c->writeEntry( cname+":parent", "yes"); } c->writeEntry( cname+":first_name", obj->firstName ); c->writeEntry( cname+":last_name", obj->lastName ); @@ -2068,12 +2068,12 @@ void PMDockManager::writeConfig( KConfig* c, TQString group ) /*************************************************************************************************/ if ( obj->isTabGroup){ c->writeEntry( cname+":type", "TAB_GROUP"); - if ( !obj->tqparent() ){ - c->writeEntry( cname+":tqparent", "___null___"); + if ( !obj->parent() ){ + c->writeEntry( cname+":parent", "___null___"); c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); c->writeEntry( cname+":visible", obj->isVisible()); } else { - c->writeEntry( cname+":tqparent", "yes"); + c->writeEntry( cname+":parent", "yes"); } TQStrList list; for ( int i = 0; i < ((PMDockTabGroup*)obj->widget)->count(); ++i ) @@ -2088,7 +2088,7 @@ void PMDockManager::writeConfig( KConfig* c, TQString group ) nList.first(); } else { /*************************************************************************************************/ - if ( !obj->tqparent() ){ + if ( !obj->parent() ){ c->writeEntry( cname+":type", "NULL_DOCK"); c->writeEntry( cname+":tqgeometry", TQRect(obj->frameGeometry().topLeft(), obj->size()) ); c->writeEntry( cname+":visible", obj->isVisible()); @@ -2149,7 +2149,7 @@ void PMDockManager::readConfig( KConfig* c, TQString group ) ++it; if ( !obj->isGroup && !obj->isTabGroup ) { - if ( obj->tqparent() ) obj->undock(); else obj->hide(); + if ( obj->parent() ) obj->undock(); else obj->hide(); } } @@ -2199,7 +2199,7 @@ void PMDockManager::readConfig( KConfig* c, TQString group ) obj = tabDockGroup; } - if ( type == "NULL_DOCK" || c->readEntry( oname + ":tqparent") == "___null___" ){ + if ( type == "NULL_DOCK" || c->readEntry( oname + ":parent") == "___null___" ){ TQRect r = c->readRectEntry( oname + ":tqgeometry" ); obj = getDockWidgetFromName( oname ); obj->applyToWidget( 0L ); @@ -2408,8 +2408,8 @@ void PMDockManager::drawDragRectangle() #ifdef _JOWENN_EXPERIMENTAL_ -PMDockArea::PMDockArea( TQWidget* tqparent, const char *name) -:TQWidget( tqparent, name) +PMDockArea::PMDockArea( TQWidget* parent, const char *name) +:TQWidget( parent, name) { TQString new_name = TQString(name) + TQString("_DockManager"); dockManager = new PMDockManager( this, new_name.latin1() ); @@ -2421,9 +2421,9 @@ PMDockArea::~PMDockArea() delete dockManager; } -PMDockWidget* PMDockArea::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent, const TQString& strCaption, const TQString& strTabPageLabel) +PMDockWidget* PMDockArea::createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent, const TQString& strCaption, const TQString& strTabPageLabel) { - return new PMDockWidget( dockManager, name.latin1(), pixmap, tqparent, strCaption, strTabPageLabel ); + return new PMDockWidget( dockManager, name.latin1(), pixmap, parent, strCaption, strTabPageLabel ); } void PMDockArea::makeDockVisible( PMDockWidget* dock ) diff --git a/kpovmodeler/pmdockwidget.h b/kpovmodeler/pmdockwidget.h index 8639e6b0..0dc5ac99 100644 --- a/kpovmodeler/pmdockwidget.h +++ b/kpovmodeler/pmdockwidget.h @@ -115,10 +115,10 @@ public: /** * Constructs this. * - * @param tqparent the tqparent widget (usually a dockwidget) + * @param parent the parent widget (usually a dockwidget) * @param name the object instance name */ - PMDockWidgetAbstractHeader( PMDockWidget* tqparent, const char* name = 0L ); + PMDockWidgetAbstractHeader( PMDockWidget* parent, const char* name = 0L ); /** * Destructs this. @@ -165,11 +165,11 @@ public: /** * Constructs this. * - * @param tqparent the tqparent widget (usually a dockwidget header) + * @param parent the parent widget (usually a dockwidget header) * @param dock the dockwidget where it belongs to * @param name the object instance name */ - PMDockWidgetAbstractHeaderDrag( PMDockWidgetAbstractHeader* tqparent, + PMDockWidgetAbstractHeaderDrag( PMDockWidgetAbstractHeader* parent, PMDockWidget* dock, const char* name = 0L ); /** @@ -211,11 +211,11 @@ public: /** * Constructs this. * - * @param tqparent the tqparent widget (usually a dockwidget header) + * @param parent the parent widget (usually a dockwidget header) * @param dock the dockwidget where it belongs to * @param name the object instance name */ - PMDockWidgetHeaderDrag( PMDockWidgetAbstractHeader* tqparent, PMDockWidget* dock, + PMDockWidgetHeaderDrag( PMDockWidgetAbstractHeader* parent, PMDockWidget* dock, const char* name = 0L ); /** @@ -253,10 +253,10 @@ public: /** * Constructs this. * - * @param tqparent the tqparent widget (usually a dockwidget) + * @param parent the parent widget (usually a dockwidget) * @param name the object instance name */ - PMDockWidgetHeader( PMDockWidget* tqparent, const char* name = 0L ); + PMDockWidgetHeader( PMDockWidget* parent, const char* name = 0L ); /** * Destructs this. @@ -358,8 +358,8 @@ public: /** * Constructs this. It just calls the method of the base class. */ - PMDockTabGroup( TQWidget *tqparent = 0, const char *name = 0 ) - :TQTabWidget( tqparent, name ){}; + PMDockTabGroup( TQWidget *parent = 0, const char *name = 0 ) + :TQTabWidget( parent, name ){}; /** * Destructs a PMDockTabGroup. @@ -378,7 +378,7 @@ private: * encapsulate the actual widgets (and member of the dockwidget class * set). * - * You just grip the double-lined panel, tear it off its tqparent + * You just grip the double-lined panel, tear it off its parent * widget, drag it somewhere and let it loose. Depending on the * position where you leave it, the dockwidget becomes a toplevel * window on the desktop (floating mode) or docks to a new widget @@ -397,7 +397,7 @@ private: * PMDockMainWindow* mainWidget; * ... * PMDockWidget* dock = 0L; - * dock = mainWidget->createDockWidget( "Any window caption", nicePixmap, 0L, i18n("window caption")); // 0L==no tqparent + * dock = mainWidget->createDockWidget( "Any window caption", nicePixmap, 0L, i18n("window caption")); // 0L==no parent * TQWidget* actualWidget = new TQWidget( dock); * dock->setWidget( actualWidget); // embed it * dock->setToolTipString(i18n("That's me")); // available when appearing as tab page @@ -429,12 +429,12 @@ public: * @param dockManager The responsible manager (dock helper) * @param name Object instance name * @param pixmap An icon (for instance shown when docked centered) - * @param tqparent Parent widget + * @param parent Parent widget * @param strCaption Title of the dockwidget window (shown when toplevel) * @param strTabPageLabel The title of the tab page (shown when in tab page mode), if it is "", only the icon will be shown, if it is 0L, the label is set to strCaption */ PMDockWidget( PMDockManager* dockManager, const char* name, - const TQPixmap &pixmap, TQWidget* tqparent = 0L, const TQString& strCaption = 0L, + const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = 0L, const TQString& strTabPageLabel = " ", WFlags f = 0); /** @@ -468,8 +468,8 @@ public: * * If the target is null, it will become a toplevel dockwidget at position pos; * Note: Docking to another dockwidget means exactly: - * A new tqparent dockwidget will be created, that replaces the target dockwidget and contains another single helper widget (tab widget or panner) - * which contains both dockwidgets, this and the target dockwidget. So consider tqparent<->child relationships change completely during such actions. + * A new parent dockwidget will be created, that replaces the target dockwidget and contains another single helper widget (tab widget or panner) + * which contains both dockwidgets, this and the target dockwidget. So consider parent<->child relationships change completely during such actions. * * @param target The dockwidget to dock to * @param dockPos One of the DockPositions this is going to dock to @@ -477,7 +477,7 @@ public: * @param pos The dock position, mainly of interest for docking to the desktop (as toplevel dockwidget) * @param check Only for internal use; * @param tabIndex The position index of the tab widget (when in tab page mode), -1 (default) means append - * @return result The group dockwidget that replaces the target dockwidget and will be grandtqparent of target and @p this. + * @return result The group dockwidget that replaces the target dockwidget and will be grandparent of target and @p this. */ PMDockWidget* manualDock( PMDockWidget* target, DockPosition dockPos, int spliPos = 50, TQPoint pos = TQPoint(0,0), bool check = false, int tabIndex = -1); @@ -506,7 +506,7 @@ public: int dockSite() const { // no docking if a floating dock widget - if( !tqparent( ) ) + if( !parent( ) ) return 0; return sDocking; } @@ -550,7 +550,7 @@ public: * There are reasons that it's impossible: * @li It is a (tab) group. * @li It is already invisible ;-) - * @li The tqparent of this is the @ref PMDockMainWindow. + * @li The parent of this is the @ref PMDockMainWindow. * @li It isn't able to dock to another widget. */ bool mayBeHide() const; @@ -560,7 +560,7 @@ public: * There are reasons that it's impossible: * @li It is a (tab) group. * @li It is already visible ;-) - * @li The tqparent of this is the @p PMDockMainWindow. + * @li The parent of this is the @p PMDockMainWindow. */ bool mayBeShow() const; @@ -612,7 +612,7 @@ public: */ virtual void show(); /** - * @return the tqparent widget of this if it inherits class PMDockTabGroup + * @return the parent widget of this if it inherits class PMDockTabGroup */ PMDockTabGroup* parentDockTabGroup() const; @@ -632,7 +632,7 @@ public: * * @param windowType is type of dock window */ - void setDockWindowTransient (TQWidget *tqparent, bool transientEnabled); + void setDockWindowTransient (TQWidget *parent, bool transientEnabled); // MODIFICATION (lpassos) /** @@ -675,7 +675,7 @@ protected: /** * Checks some conditions and shows or hides the dockwidget header (drag panel). * The header is hidden if: - * @li the tqparent widget is the PMDockMainWindow + * @li the parent widget is the PMDockMainWindow * @li this is a (tab) group dockwidget * @li it is not able to dock to another dockwidget */ @@ -754,7 +754,7 @@ private: void setDockTabName( PMDockTabGroup* g); /** - * Retqparent to s or set this to the PMDockMainWindow's view if s is that dockmainwindow. + * Reparent to s or set this to the PMDockMainWindow's view if s is that dockmainwindow. * If s is O, simply move the widget. * * @param s the target widget to reparent to @@ -894,7 +894,7 @@ public: /** * Shows all encapsulated widgets of all controlled dockwidgets and shows all dockwidgets which are - * tqparent of a dockwidget tab group. + * parent of a dockwidget tab group. */ void activate(); @@ -989,7 +989,7 @@ signals: void replaceDock( PMDockWidget* oldDock, PMDockWidget* newDock ); /** - * Signals a dockwidget without tqparent (toplevel) is shown. + * Signals a dockwidget without parent (toplevel) is shown. */ void setDockDefaultPos( PMDockWidget* ); @@ -1043,7 +1043,7 @@ private: * Finds the TQWidget recursively at the position given as parameter * * @param w a variable where the method puts the TQWidget at that position (instead of a return value) - * @param p the tqparent widget where the recursive search should start from + * @param p the parent widget where the recursive search should start from * @param pos global (desktop) position of the wanted dockwidget */ void findChildDockWidget( TQWidget*& w, const TQWidget* p, const TQPoint& pos ); @@ -1053,7 +1053,7 @@ public: /** * Finds all dockwidgets which are child, grandchild and so on of p. * - * @param p the tqparent widget where the recursive search starts from + * @param p the parent widget where the recursive search starts from * @param l the widget list that contains the search result after the return of this method */ void findChildDockWidget( const TQWidget* p, TQWidgetList& l); @@ -1231,7 +1231,7 @@ public: * * @param name object name */ - PMDockMainWindow( TQWidget* tqparent = 0L, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose ); + PMDockMainWindow( TQWidget* parent = 0L, const char *name = 0L, WFlags f = WType_TopLevel | WDestructiveClose ); /** * Destructs a dockmainwindow. @@ -1266,12 +1266,12 @@ public: * * @param name TQObject name (default dockwidget caption) * @param pixmap window icon (for instance shown when docked as tabwidget entry) - * @param tqparent tqparent widget for the new dockwidget + * @param parent parent widget for the new dockwidget * @param strCaption window title (shown when toplevel) * @param strTabPageLabel title of the tab page (visible when in tab page mode), if it is "", only the icon will be shown; if it is 0L, the label is set to strCaption * @return a pointer to the new created dockwidget */ - PMDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent = 0L, const TQString& strCaption = 0L, const TQString& strTabPageLabel = " "); + PMDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = 0L, const TQString& strTabPageLabel = " "); /** * Saves the current dock window tqlayout into a DOM tree below the given element. @@ -1427,7 +1427,7 @@ friend class PMDockManager; public: - PMDockArea( TQWidget* tqparent = 0L, const char *name = 0L); + PMDockArea( TQWidget* parent = 0L, const char *name = 0L); virtual ~PMDockArea(); @@ -1437,7 +1437,7 @@ public: void setMainDockWidget( PMDockWidget* ); PMDockWidget* getMainDockWidget(){ return mainDockWidget; } - PMDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* tqparent = 0L, const TQString& strCaption = 0L, const TQString& strTabPageLabel = " "); + PMDockWidget* createDockWidget( const TQString& name, const TQPixmap &pixmap, TQWidget* parent = 0L, const TQString& strCaption = 0L, const TQString& strTabPageLabel = " "); void writeDockConfig(TQDomElement &base); void readDockConfig(TQDomElement &base); diff --git a/kpovmodeler/pmdockwidget_private.cpp b/kpovmodeler/pmdockwidget_private.cpp index 3dd59456..9c97888f 100644 --- a/kpovmodeler/pmdockwidget_private.cpp +++ b/kpovmodeler/pmdockwidget_private.cpp @@ -22,8 +22,8 @@ #include <tqpainter.h> #include <tqcursor.h> -PMDockSplitter::PMDockSplitter(TQWidget *tqparent, const char *name, Qt::Orientation orient, int pos, bool highResolution) -: TQWidget(tqparent, name) +PMDockSplitter::PMDockSplitter(TQWidget *parent, const char *name, Qt::Orientation orient, int pos, bool highResolution) +: TQWidget(parent, name) { divider = 0L; child0 = 0L; @@ -288,8 +288,8 @@ bool PMDockSplitter::highResolution() const /*************************************************************************/ -PMDockButton_Private::PMDockButton_Private( TQWidget *tqparent, const char * name ) -:TQPushButton( tqparent, name ) +PMDockButton_Private::PMDockButton_Private( TQWidget *parent, const char * name ) +:TQPushButton( parent, name ) { moveMouse = false; setFocusPolicy( TQ_NoFocus ); diff --git a/kpovmodeler/pmdockwidget_private.h b/kpovmodeler/pmdockwidget_private.h index a2111a90..59b4516c 100644 --- a/kpovmodeler/pmdockwidget_private.h +++ b/kpovmodeler/pmdockwidget_private.h @@ -44,7 +44,7 @@ class PMDockSplitter : public TQWidget Q_OBJECT TQ_OBJECT public: - PMDockSplitter(TQWidget *tqparent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50, bool highResolution=false); + PMDockSplitter(TQWidget *parent= 0, const char *name= 0, Qt::Orientation orient=Qt::Vertical, int pos= 50, bool highResolution=false); virtual ~PMDockSplitter(){}; void activate(TQWidget *c0, TQWidget *c1 = 0L); @@ -99,7 +99,7 @@ class PMDockButton_Private : public TQPushButton Q_OBJECT TQ_OBJECT public: - PMDockButton_Private( TQWidget *tqparent=0, const char *name=0 ); + PMDockButton_Private( TQWidget *parent=0, const char *name=0 ); ~PMDockButton_Private(); protected: diff --git a/kpovmodeler/pmdragwidget.cpp b/kpovmodeler/pmdragwidget.cpp index 7e800f72..bc097c46 100644 --- a/kpovmodeler/pmdragwidget.cpp +++ b/kpovmodeler/pmdragwidget.cpp @@ -17,8 +17,8 @@ #include "pmdragwidget.h" -PMDragWidget::PMDragWidget( TQWidget* tqparent, const char* name, WFlags f ) - : TQWidget( tqparent, name, f ) +PMDragWidget::PMDragWidget( TQWidget* parent, const char* name, WFlags f ) + : TQWidget( parent, name, f ) { dragging = false; } diff --git a/kpovmodeler/pmdragwidget.h b/kpovmodeler/pmdragwidget.h index 79efb3f6..d4e15f36 100644 --- a/kpovmodeler/pmdragwidget.h +++ b/kpovmodeler/pmdragwidget.h @@ -36,7 +36,7 @@ class PMDragWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - PMDragWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0 ); + PMDragWidget( TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); virtual void startDrag( ); diff --git a/kpovmodeler/pmerrordialog.cpp b/kpovmodeler/pmerrordialog.cpp index 2ff5994f..eb920fb0 100644 --- a/kpovmodeler/pmerrordialog.cpp +++ b/kpovmodeler/pmerrordialog.cpp @@ -29,8 +29,8 @@ TQSize PMErrorDialog::s_size = TQSize( 150, 200 ); PMErrorDialog::PMErrorDialog( const PMMessageList& messages, int errorFlags, - TQWidget* tqparent, const char* name ) - : KDialogBase( tqparent, name, true, i18n( "Messages" ), + TQWidget* parent, const char* name ) + : KDialogBase( parent, name, true, i18n( "Messages" ), Ok | Cancel, Cancel ) { TQVBox* page = makeVBoxMainWidget( ); @@ -51,7 +51,7 @@ PMErrorDialog::PMErrorDialog( const PMMessageList& messages, int errorFlags, for( ; pit.current( ); ++pit ) { PMObject* obj = pit.current( )->linkedObject( ); - for( ; obj; obj = obj->tqparent( ) ) + for( ; obj; obj = obj->parent( ) ) { TQPtrList<PMMessage>* pList = m_messageDict.find( obj ); if( !pList ) @@ -60,7 +60,7 @@ PMErrorDialog::PMErrorDialog( const PMMessageList& messages, int errorFlags, m_messageDict.insert( obj, pList ); } pList->append( pit.current( ) ); - if( !obj->tqparent( ) ) + if( !obj->parent( ) ) { if( obj->type( ) != "scene" ) { diff --git a/kpovmodeler/pmerrordialog.h b/kpovmodeler/pmerrordialog.h index 8310b3ad..06982e69 100644 --- a/kpovmodeler/pmerrordialog.h +++ b/kpovmodeler/pmerrordialog.h @@ -45,7 +45,7 @@ class PMErrorDialog : public KDialogBase TQ_OBJECT public: /** - * Creates a modal PMErrorDialog with tqparent and name. + * Creates a modal PMErrorDialog with parent and name. * * messages is the message list. If the list contains a message of type * FatalError, the 'Proceed" button will not be shown. @@ -54,7 +54,7 @@ public: * should be continued. */ PMErrorDialog( const PMMessageList& messages, int errorFlags, - TQWidget* tqparent = 0, const char* name = 0 ); + TQWidget* parent = 0, const char* name = 0 ); static void saveConfig( KConfig* cfg ); static void restoreConfig( KConfig* cfg ); diff --git a/kpovmodeler/pmfactory.cpp b/kpovmodeler/pmfactory.cpp index 57881593..488db1ce 100644 --- a/kpovmodeler/pmfactory.cpp +++ b/kpovmodeler/pmfactory.cpp @@ -56,7 +56,7 @@ PMFactory::~PMFactory( ) KParts::Part* PMFactory::createPartObject( TQWidget* parentWidget, const char* widgetName, - TQObject* tqparent, const char* name, + TQObject* parent, const char* name, const char* classname, const TQStringList& /*args*/ ) { @@ -66,7 +66,7 @@ KParts::Part* PMFactory::createPartObject( TQWidget* parentWidget, || ( strcmp( classname, "KParts::ReadOnlyPart" ) == 0 ) ); KParts::ReadWritePart *part = new PMPart( parentWidget, widgetName, - tqparent, name, readwrite ); + parent, name, readwrite ); return part; } diff --git a/kpovmodeler/pmfactory.h b/kpovmodeler/pmfactory.h index dac51e7b..be5efe9c 100644 --- a/kpovmodeler/pmfactory.h +++ b/kpovmodeler/pmfactory.h @@ -35,7 +35,7 @@ public: virtual KParts::Part* createPartObject( TQWidget* parentWidget, const char* widgetName, - TQObject* tqparent, const char* name, + TQObject* parent, const char* name, const char* classname, const TQStringList& args ); diff --git a/kpovmodeler/pmfiledialog.cpp b/kpovmodeler/pmfiledialog.cpp index 65ad11c8..96085f19 100644 --- a/kpovmodeler/pmfiledialog.cpp +++ b/kpovmodeler/pmfiledialog.cpp @@ -22,13 +22,13 @@ #include <kfilefiltercombo.h> -PMFileDialog::PMFileDialog( const TQString& startDir, const TQString& filter, TQWidget* tqparent, const char* name, bool modal ) - : KFileDialog( startDir, filter, tqparent, name, modal ) +PMFileDialog::PMFileDialog( const TQString& startDir, const TQString& filter, TQWidget* parent, const char* name, bool modal ) + : KFileDialog( startDir, filter, parent, name, modal ) { } -TQString PMFileDialog::getImportFileName( TQWidget* tqparent, PMPart* part, +TQString PMFileDialog::getImportFileName( TQWidget* parent, PMPart* part, PMIOFormat*& format ) { PMIOManager* manager = part->ioManager( ); @@ -52,7 +52,7 @@ TQString PMFileDialog::getImportFileName( TQWidget* tqparent, PMPart* part, } } - PMFileDialog dlg( TQString(), filter, tqparent, "import file dialog", true ); + PMFileDialog dlg( TQString(), filter, parent, "import file dialog", true ); dlg.setOperationMode( Opening ); dlg.setMode( KFile::File | KFile::LocalOnly ); dlg.setCaption( i18n( "Import" ) ); @@ -64,7 +64,7 @@ TQString PMFileDialog::getImportFileName( TQWidget* tqparent, PMPart* part, return dlg.selectedFile( ); } -TQString PMFileDialog::getExportFileName( TQWidget* tqparent, PMPart* part, +TQString PMFileDialog::getExportFileName( TQWidget* parent, PMPart* part, PMIOFormat*& format, TQString& selectedFilter ) { PMIOManager* manager = part->ioManager( ); @@ -88,7 +88,7 @@ TQString PMFileDialog::getExportFileName( TQWidget* tqparent, PMPart* part, } } - PMFileDialog dlg( TQString(), filter, tqparent, "export file dialog", true ); + PMFileDialog dlg( TQString(), filter, parent, "export file dialog", true ); dlg.setOperationMode( Saving ); dlg.setMode( KFile::File | KFile::LocalOnly ); dlg.setCaption( i18n( "Export" ) ); diff --git a/kpovmodeler/pmfiledialog.h b/kpovmodeler/pmfiledialog.h index 7aa69b70..16ed6944 100644 --- a/kpovmodeler/pmfiledialog.h +++ b/kpovmodeler/pmfiledialog.h @@ -44,17 +44,17 @@ public: * Default constructor, use the static methods * @ref getImportFileName or @ref getExportFileName instead */ - PMFileDialog( const TQString& startDir, const TQString& filter, TQWidget* tqparent, const char* name, bool modal ); + PMFileDialog( const TQString& startDir, const TQString& filter, TQWidget* parent, const char* name, bool modal ); /** * Opens a modal file dialog and returns a selected file and the chosen * file format. */ - static TQString getImportFileName( TQWidget* tqparent, PMPart* part, PMIOFormat*& format ); + static TQString getImportFileName( TQWidget* parent, PMPart* part, PMIOFormat*& format ); /** * Opens a modal file dialog and returns a selected file and the chosen * file format and filter. */ - static TQString getExportFileName( TQWidget* tqparent, PMPart* part, + static TQString getExportFileName( TQWidget* parent, PMPart* part, PMIOFormat*& format, TQString& filter ); }; diff --git a/kpovmodeler/pmfinish.cpp b/kpovmodeler/pmfinish.cpp index 190925fb..80898d97 100644 --- a/kpovmodeler/pmfinish.cpp +++ b/kpovmodeler/pmfinish.cpp @@ -637,9 +637,9 @@ void PMFinish::setIridTurbulence( double c ) } } -PMDialogEditBase* PMFinish::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMFinish::editWidget( TQWidget* parent ) const { - return new PMFinishEdit( tqparent ); + return new PMFinishEdit( parent ); } void PMFinish::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmfinish.h b/kpovmodeler/pmfinish.h index a33f9d40..2a7fda19 100644 --- a/kpovmodeler/pmfinish.h +++ b/kpovmodeler/pmfinish.h @@ -65,7 +65,7 @@ public: /** * Returns a new @ref PMFinishEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmfinish" ); } diff --git a/kpovmodeler/pmfinishedit.cpp b/kpovmodeler/pmfinishedit.cpp index 997fe901..e3513a5d 100644 --- a/kpovmodeler/pmfinishedit.cpp +++ b/kpovmodeler/pmfinishedit.cpp @@ -29,8 +29,8 @@ #include <kdialog.h> -PMFinishEdit::PMFinishEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMFinishEdit::PMFinishEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmfinishedit.h b/kpovmodeler/pmfinishedit.h index 9d37ce14..f7f5cafd 100644 --- a/kpovmodeler/pmfinishedit.h +++ b/kpovmodeler/pmfinishedit.h @@ -43,9 +43,9 @@ class PMFinishEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMFinishEdit with tqparent and name + * Creates a PMFinishEdit with parent and name */ - PMFinishEdit( TQWidget* tqparent, const char* name = 0 ); + PMFinishEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmfog.cpp b/kpovmodeler/pmfog.cpp index 1ece2757..36f39a30 100644 --- a/kpovmodeler/pmfog.cpp +++ b/kpovmodeler/pmfog.cpp @@ -284,9 +284,9 @@ void PMFog::setUp( const PMVector& c ) } } -PMDialogEditBase* PMFog::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMFog::editWidget( TQWidget* parent ) const { - return new PMFogEdit( tqparent ); + return new PMFogEdit( parent ); } void PMFog::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmfog.h b/kpovmodeler/pmfog.h index 2eac23a8..cfdfa539 100644 --- a/kpovmodeler/pmfog.h +++ b/kpovmodeler/pmfog.h @@ -66,7 +66,7 @@ public: /** * Returns a new @ref PMFogEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmfog" ); } diff --git a/kpovmodeler/pmfogedit.cpp b/kpovmodeler/pmfogedit.cpp index d993ad3f..ec9880c1 100644 --- a/kpovmodeler/pmfogedit.cpp +++ b/kpovmodeler/pmfogedit.cpp @@ -30,8 +30,8 @@ #include <kmessagebox.h> #include <kdialog.h> -PMFogEdit::PMFogEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMFogEdit::PMFogEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmfogedit.h b/kpovmodeler/pmfogedit.h index 3331f167..5dc1d301 100644 --- a/kpovmodeler/pmfogedit.h +++ b/kpovmodeler/pmfogedit.h @@ -46,9 +46,9 @@ class PMFogEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMFogEdit with tqparent and name + * Creates a PMFogEdit with parent and name */ - PMFogEdit( TQWidget* tqparent, const char* name = 0 ); + PMFogEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmformulalabel.cpp b/kpovmodeler/pmformulalabel.cpp index 1f1ffbf9..51b5e13f 100644 --- a/kpovmodeler/pmformulalabel.cpp +++ b/kpovmodeler/pmformulalabel.cpp @@ -46,8 +46,8 @@ TQString PMFormulaLabel::s_digit[10] = TQString PMFormulaLabel::s_nullString = TQString( "= 0" ); -PMFormulaLabel::PMFormulaLabel( const PMPolynomExponents& exp, TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +PMFormulaLabel::PMFormulaLabel( const PMPolynomExponents& exp, TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { m_exponents[0] = exp.exponent( 0 ); m_exponents[1] = exp.exponent( 1 ); @@ -56,8 +56,8 @@ PMFormulaLabel::PMFormulaLabel( const PMPolynomExponents& exp, TQWidget* tqparen calculateSizeHint( ); } -PMFormulaLabel::PMFormulaLabel( int x, int y, int z, TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +PMFormulaLabel::PMFormulaLabel( int x, int y, int z, TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { m_exponents[0] = x; m_exponents[1] = y; diff --git a/kpovmodeler/pmformulalabel.h b/kpovmodeler/pmformulalabel.h index bac843d2..00d75ed8 100644 --- a/kpovmodeler/pmformulalabel.h +++ b/kpovmodeler/pmformulalabel.h @@ -37,11 +37,11 @@ public: /** * Displays the exponents of the @ref PMPolynomExponents */ - PMFormulaLabel( const PMPolynomExponents& exp, TQWidget* tqparent, const char* name = 0 ); + PMFormulaLabel( const PMPolynomExponents& exp, TQWidget* parent, const char* name = 0 ); /** * Displays the given exponents */ - PMFormulaLabel( int x, int y, int z, TQWidget* tqparent, const char* name = 0 ); + PMFormulaLabel( int x, int y, int z, TQWidget* parent, const char* name = 0 ); /** * Destructor */ diff --git a/kpovmodeler/pmglobalphotons.cpp b/kpovmodeler/pmglobalphotons.cpp index 78834bf0..5d5835be 100644 --- a/kpovmodeler/pmglobalphotons.cpp +++ b/kpovmodeler/pmglobalphotons.cpp @@ -437,9 +437,9 @@ void PMGlobalPhotons::setRadiusMediaMulti( double rmm ) } } -PMDialogEditBase* PMGlobalPhotons::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMGlobalPhotons::editWidget( TQWidget* parent ) const { - return new PMGlobalPhotonsEdit( tqparent ); + return new PMGlobalPhotonsEdit( parent ); } void PMGlobalPhotons::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmglobalphotons.h b/kpovmodeler/pmglobalphotons.h index ad50b5a9..7a32b14e 100644 --- a/kpovmodeler/pmglobalphotons.h +++ b/kpovmodeler/pmglobalphotons.h @@ -67,7 +67,7 @@ public: /** * Returns a new @ref PMGlobalPhotonsEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmglobalphotonsedit.cpp b/kpovmodeler/pmglobalphotonsedit.cpp index 01c6479e..5a4a5572 100644 --- a/kpovmodeler/pmglobalphotonsedit.cpp +++ b/kpovmodeler/pmglobalphotonsedit.cpp @@ -29,8 +29,8 @@ #include <kmessagebox.h> -PMGlobalPhotonsEdit::PMGlobalPhotonsEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMGlobalPhotonsEdit::PMGlobalPhotonsEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmglobalphotonsedit.h b/kpovmodeler/pmglobalphotonsedit.h index 61db154f..4e963091 100644 --- a/kpovmodeler/pmglobalphotonsedit.h +++ b/kpovmodeler/pmglobalphotonsedit.h @@ -42,9 +42,9 @@ class PMGlobalPhotonsEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMGlobalPhotonsEdit with tqparent and name + * Creates a PMGlobalPhotonsEdit with parent and name */ - PMGlobalPhotonsEdit( TQWidget* tqparent, const char* name = 0 ); + PMGlobalPhotonsEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmglobalsettings.cpp b/kpovmodeler/pmglobalsettings.cpp index 739c45ff..1c75b40a 100644 --- a/kpovmodeler/pmglobalsettings.cpp +++ b/kpovmodeler/pmglobalsettings.cpp @@ -432,9 +432,9 @@ void PMGlobalSettings::setRecursionLimit( int c ) } } -PMDialogEditBase* PMGlobalSettings::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMGlobalSettings::editWidget( TQWidget* parent ) const { - return new PMGlobalSettingsEdit( tqparent ); + return new PMGlobalSettingsEdit( parent ); } void PMGlobalSettings::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmglobalsettings.h b/kpovmodeler/pmglobalsettings.h index b254afe0..fad60d92 100644 --- a/kpovmodeler/pmglobalsettings.h +++ b/kpovmodeler/pmglobalsettings.h @@ -68,7 +68,7 @@ public: /** * Returns a new @ref PMGlobalSettingsEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmglobalsettingsedit.cpp b/kpovmodeler/pmglobalsettingsedit.cpp index 8e47e845..027152e6 100644 --- a/kpovmodeler/pmglobalsettingsedit.cpp +++ b/kpovmodeler/pmglobalsettingsedit.cpp @@ -29,8 +29,8 @@ #include <kdialog.h> #include <kmessagebox.h> -PMGlobalSettingsEdit::PMGlobalSettingsEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMGlobalSettingsEdit::PMGlobalSettingsEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmglobalsettingsedit.h b/kpovmodeler/pmglobalsettingsedit.h index fbe8623d..07b9d96e 100644 --- a/kpovmodeler/pmglobalsettingsedit.h +++ b/kpovmodeler/pmglobalsettingsedit.h @@ -43,9 +43,9 @@ class PMGlobalSettingsEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMGlobalSettingsEdit with tqparent and name + * Creates a PMGlobalSettingsEdit with parent and name */ - PMGlobalSettingsEdit( TQWidget* tqparent, const char* name = 0 ); + PMGlobalSettingsEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmglview.cpp b/kpovmodeler/pmglview.cpp index 9b7779ae..2bd819c4 100644 --- a/kpovmodeler/pmglview.cpp +++ b/kpovmodeler/pmglview.cpp @@ -106,8 +106,8 @@ bool PMGLView::s_bDirect = true; PMGLView::PMGLView( PMPart* part, PMViewType t, - TQWidget* tqparent, const char* name, WFlags f ) - : PMViewBase( tqparent, name, f | TQt::WWinOwnDC | TQt::WRepaintNoErase ) + TQWidget* parent, const char* name, WFlags f ) + : PMViewBase( parent, name, f | TQt::WWinOwnDC | TQt::WRepaintNoErase ) { m_pPart = part; m_type = t; @@ -1178,9 +1178,9 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode, if( m_pCamera == ( PMCamera* ) obj ) invalidateProjection( ); - if( obj->tqparent( ) ) - if( obj->tqparent( )->type( ) == "Camera" ) - if( m_pCamera == ( PMCamera* ) obj->tqparent( ) ) + if( obj->parent( ) ) + if( obj->parent( )->type( ) == "Camera" ) + if( m_pCamera == ( PMCamera* ) obj->parent( ) ) if( obj->hasTransformationMatrix( ) ) invalidateProjection( ); } @@ -1209,9 +1209,9 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode, if( obj->type( ) == "Camera" ) if( !m_pCamera ) setCamera( ( PMCamera* ) obj ); - if( obj->tqparent( ) ) - if( obj->tqparent( )->type( ) == "Camera" ) - if( m_pCamera == ( PMCamera* ) obj->tqparent( ) ) + if( obj->parent( ) ) + if( obj->parent( )->type( ) == "Camera" ) + if( m_pCamera == ( PMCamera* ) obj->parent( ) ) if( obj->hasTransformationMatrix( ) ) invalidateProjection( ); } @@ -1225,9 +1225,9 @@ void PMGLView::slotObjectChanged( PMObject* obj, const int mode, setCamera( 0 ); if( m_type == PMGLView::PMViewCamera ) - if( obj->tqparent( ) ) - if( obj->tqparent( )->type( ) == "Camera" ) - if( m_pCamera == ( PMCamera* ) obj->tqparent( ) ) + if( obj->parent( ) ) + if( obj->parent( )->type( ) == "Camera" ) + if( m_pCamera == ( PMCamera* ) obj->parent( ) ) if( obj->hasTransformationMatrix( ) ) invalidateProjection( ); @@ -1296,7 +1296,7 @@ PMObject* PMGLView::topLevelRenderingObject( PMObject* o ) const else if( obj->isA( "Scene" ) || obj->isA( "Declare" ) ) stop = true; else - obj = obj->tqparent( ); + obj = obj->parent( ); } while( !stop ); } @@ -1760,10 +1760,10 @@ TQString PMGLViewFactory::description( PMViewOptions* vo ) const return description( ); } -PMViewOptionsWidget* PMGLViewFactory::newOptionsWidget( TQWidget* tqparent, +PMViewOptionsWidget* PMGLViewFactory::newOptionsWidget( TQWidget* parent, PMViewOptions* o ) { - return new PMGLViewOptionsWidget( tqparent, o ); + return new PMGLViewOptionsWidget( parent, o ); } PMViewOptions* PMGLViewFactory::newOptionsInstance( ) const @@ -1772,9 +1772,9 @@ PMViewOptions* PMGLViewFactory::newOptionsInstance( ) const return o; } -PMGLViewOptionsWidget::PMGLViewOptionsWidget( TQWidget* tqparent, +PMGLViewOptionsWidget::PMGLViewOptionsWidget( TQWidget* parent, PMViewOptions* o ) - : PMViewOptionsWidget( tqparent ) + : PMViewOptionsWidget( parent ) { m_pOptions = ( PMGLViewOptions* ) o; diff --git a/kpovmodeler/pmglview.h b/kpovmodeler/pmglview.h index e6954370..9f1035af 100644 --- a/kpovmodeler/pmglview.h +++ b/kpovmodeler/pmglview.h @@ -62,7 +62,7 @@ public: * Constructor */ PMGLView( PMPart* part, PMViewType t, - TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0 ); + TQWidget* parent = 0, const char* name = 0, WFlags f = 0 ); /** * Destructor */ @@ -559,9 +559,9 @@ public: virtual TQString description( ) const; virtual TQString description( PMViewOptions* ) const; virtual TQString iconName( ) const { return TQString( "pmglview" ); } - virtual PMViewBase* newInstance( TQWidget* tqparent, PMPart* part ) const + virtual PMViewBase* newInstance( TQWidget* parent, PMPart* part ) const { - return new PMGLView( part, PMGLView::PMViewPosX, tqparent ); + return new PMGLView( part, PMGLView::PMViewPosX, parent ); } virtual PMViewOptions* newOptionsInstance( ) const; virtual PMViewOptionsWidget* newOptionsWidget( TQWidget*, PMViewOptions* ); @@ -578,7 +578,7 @@ public: /** * Default constructor */ - PMGLViewOptionsWidget( TQWidget* tqparent, PMViewOptions* o ); + PMGLViewOptionsWidget( TQWidget* parent, PMViewOptions* o ); protected slots: void slotGLViewTypeChanged( int ); diff --git a/kpovmodeler/pmgraphicalobject.h b/kpovmodeler/pmgraphicalobject.h index 662f7682..19ea826d 100644 --- a/kpovmodeler/pmgraphicalobject.h +++ b/kpovmodeler/pmgraphicalobject.h @@ -101,7 +101,7 @@ public: */ void setVisibilityLevel( int level ); /** - * Returns true if the visibility level is relative to the objects tqparent + * Returns true if the visibility level is relative to the objects parent */ bool isVisibilityLevelRelative( ) const { return m_relativeVisibility; } /** diff --git a/kpovmodeler/pmgraphicalobjectedit.cpp b/kpovmodeler/pmgraphicalobjectedit.cpp index 106fbc2a..1429d75f 100644 --- a/kpovmodeler/pmgraphicalobjectedit.cpp +++ b/kpovmodeler/pmgraphicalobjectedit.cpp @@ -28,8 +28,8 @@ const int c_minValue = -1000; const int c_maxValue = 1000; -PMGraphicalObjectEdit::PMGraphicalObjectEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMGraphicalObjectEdit::PMGraphicalObjectEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } @@ -143,7 +143,7 @@ void PMGraphicalObjectEdit::slotLevelChanged( int ) void PMGraphicalObjectEdit::recalculateResultingVisibility( ) { - PMObject* o = m_pDisplayedObject->tqparent( ); + PMObject* o = m_pDisplayedObject->parent( ); PMGraphicalObject* go = 0; int level = 0; bool absoluteFound = false; @@ -152,7 +152,7 @@ void PMGraphicalObjectEdit::recalculateResultingVisibility( ) if( !m_pRelativeVisibility->isChecked( ) ) absoluteFound = true; - for( ; o && !absoluteFound; o = o->tqparent( ) ) + for( ; o && !absoluteFound; o = o->parent( ) ) { if( o->isA( "GraphicalObject" ) ) { diff --git a/kpovmodeler/pmgraphicalobjectedit.h b/kpovmodeler/pmgraphicalobjectedit.h index 36758f63..7564edae 100644 --- a/kpovmodeler/pmgraphicalobjectedit.h +++ b/kpovmodeler/pmgraphicalobjectedit.h @@ -41,9 +41,9 @@ class PMGraphicalObjectEdit : public PMDetailObjectEdit typedef PMDetailObjectEdit Base; public: /** - * Creates a PMGraphicalObjectEdit with tqparent and name + * Creates a PMGraphicalObjectEdit with parent and name */ - PMGraphicalObjectEdit( TQWidget* tqparent, const char* name = 0 ); + PMGraphicalObjectEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmgridsettings.cpp b/kpovmodeler/pmgridsettings.cpp index e13e303f..69319187 100644 --- a/kpovmodeler/pmgridsettings.cpp +++ b/kpovmodeler/pmgridsettings.cpp @@ -28,8 +28,8 @@ #include <kcolorbutton.h> #include <klocale.h> -PMGridSettings::PMGridSettings( TQWidget* tqparent, const char* name ) - : PMSettingsDialogPage( tqparent, name ) +PMGridSettings::PMGridSettings( TQWidget* parent, const char* name ) + : PMSettingsDialogPage( parent, name ) { TQHBoxLayout* htqlayout; TQVBoxLayout* vtqlayout; diff --git a/kpovmodeler/pmgridsettings.h b/kpovmodeler/pmgridsettings.h index 20b4f01e..01eb7b37 100644 --- a/kpovmodeler/pmgridsettings.h +++ b/kpovmodeler/pmgridsettings.h @@ -39,7 +39,7 @@ public: /** * Default constructor */ - PMGridSettings( TQWidget* tqparent, const char* name = 0 ); + PMGridSettings( TQWidget* parent, const char* name = 0 ); /** */ virtual void displaySettings( ); /** */ diff --git a/kpovmodeler/pmheightfield.cpp b/kpovmodeler/pmheightfield.cpp index 654cd43c..154c6f57 100644 --- a/kpovmodeler/pmheightfield.cpp +++ b/kpovmodeler/pmheightfield.cpp @@ -200,9 +200,9 @@ void PMHeightField::setWaterLevel( double wl ) } } -PMDialogEditBase* PMHeightField::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMHeightField::editWidget( TQWidget* parent ) const { - return new PMHeightFieldEdit( tqparent ); + return new PMHeightFieldEdit( parent ); } void PMHeightField::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmheightfield.h b/kpovmodeler/pmheightfield.h index 62afe95b..92d9724b 100644 --- a/kpovmodeler/pmheightfield.h +++ b/kpovmodeler/pmheightfield.h @@ -69,7 +69,7 @@ public: /** * Returns a new @ref PMHeightFieldEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmheightfieldedit.cpp b/kpovmodeler/pmheightfieldedit.cpp index b3de59fa..cc413acf 100644 --- a/kpovmodeler/pmheightfieldedit.cpp +++ b/kpovmodeler/pmheightfieldedit.cpp @@ -31,8 +31,8 @@ #include <kiconloader.h> #include <kfiledialog.h> -PMHeightFieldEdit::PMHeightFieldEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMHeightFieldEdit::PMHeightFieldEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmheightfieldedit.h b/kpovmodeler/pmheightfieldedit.h index 2b97b03a..a04e21b3 100644 --- a/kpovmodeler/pmheightfieldedit.h +++ b/kpovmodeler/pmheightfieldedit.h @@ -43,9 +43,9 @@ class PMHeightFieldEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMHeightFieldEdit with tqparent and name + * Creates a PMHeightFieldEdit with parent and name */ - PMHeightFieldEdit( TQWidget* tqparent, const char* name = 0 ); + PMHeightFieldEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmimagemap.cpp b/kpovmodeler/pmimagemap.cpp index 2040de46..e867f72e 100644 --- a/kpovmodeler/pmimagemap.cpp +++ b/kpovmodeler/pmimagemap.cpp @@ -459,9 +459,9 @@ void PMImageMap::setTransmits( const TQValueList<PMPaletteValue>& c ) } } -PMDialogEditBase* PMImageMap::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMImageMap::editWidget( TQWidget* parent ) const { - return new PMImageMapEdit( tqparent ); + return new PMImageMapEdit( parent ); } void PMImageMap::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmimagemap.h b/kpovmodeler/pmimagemap.h index 859fb5f3..4ee38233 100644 --- a/kpovmodeler/pmimagemap.h +++ b/kpovmodeler/pmimagemap.h @@ -86,7 +86,7 @@ public: /** * Returns a new @ref PMImageMapEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Gets the bitmap type diff --git a/kpovmodeler/pmimagemapedit.cpp b/kpovmodeler/pmimagemapedit.cpp index 3804d89d..7f52442e 100644 --- a/kpovmodeler/pmimagemapedit.cpp +++ b/kpovmodeler/pmimagemapedit.cpp @@ -38,8 +38,8 @@ #include <kfiledialog.h> #include <kiconloader.h> -PMImageMapEdit::PMImageMapEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMImageMapEdit::PMImageMapEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmimagemapedit.h b/kpovmodeler/pmimagemapedit.h index 4b5d4b2e..3754bbf2 100644 --- a/kpovmodeler/pmimagemapedit.h +++ b/kpovmodeler/pmimagemapedit.h @@ -49,9 +49,9 @@ class PMImageMapEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMImageMapEdit with tqparent and name + * Creates a PMImageMapEdit with parent and name */ - PMImageMapEdit( TQWidget* tqparent, const char* name = 0 ); + PMImageMapEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pminserterrordialog.cpp b/kpovmodeler/pminserterrordialog.cpp index 65d1c66d..c0203984 100644 --- a/kpovmodeler/pminserterrordialog.cpp +++ b/kpovmodeler/pminserterrordialog.cpp @@ -25,8 +25,8 @@ PMInsertErrorDialog::PMInsertErrorDialog( int numObj, int numErrors, const TQStringList& details, - TQWidget* tqparent /*= 0*/, const char* name /*= 0*/ ) - : KDialogBase( tqparent, name, true, i18n( "Insert Errors" ), + TQWidget* parent /*= 0*/, const char* name /*= 0*/ ) + : KDialogBase( parent, name, true, i18n( "Insert Errors" ), Help | Ok | User1, Ok, false, i18n( "Details" ) ) { TQVBox* page = makeVBoxMainWidget( ); diff --git a/kpovmodeler/pminserterrordialog.h b/kpovmodeler/pminserterrordialog.h index 09eb32dd..fe4a48fe 100644 --- a/kpovmodeler/pminserterrordialog.h +++ b/kpovmodeler/pminserterrordialog.h @@ -39,11 +39,11 @@ class PMInsertErrorDialog : public KDialogBase TQ_OBJECT public: /** - * Creates a modal PMInsertErrorDialog with tqparent and name. + * Creates a modal PMInsertErrorDialog with parent and name. */ PMInsertErrorDialog( int NumberOfObjects, int NumberOfInsertErrors, const TQStringList& details, - TQWidget* tqparent = 0, const char* name = 0 ); + TQWidget* parent = 0, const char* name = 0 ); protected slots: void slotUser1( ); diff --git a/kpovmodeler/pminsertpopup.cpp b/kpovmodeler/pminsertpopup.cpp index addab3cf..0f8ffb23 100644 --- a/kpovmodeler/pminsertpopup.cpp +++ b/kpovmodeler/pminsertpopup.cpp @@ -21,11 +21,11 @@ #include <kiconloader.h> #include <tqcursor.h> -PMInsertPopup::PMInsertPopup( TQWidget* tqparent, bool multipleObjects, +PMInsertPopup::PMInsertPopup( TQWidget* parent, bool multipleObjects, int items, bool canInsertAllAsFirstChildren, bool canInsertAllAsLastChildren, bool canInsertAllAsSiblings, const char* name ) - : KPopupMenu( tqparent, name ) + : KPopupMenu( parent, name ) { TQString itemText; if( multipleObjects ) @@ -71,13 +71,13 @@ PMInsertPopup::PMInsertPopup( TQWidget* tqparent, bool multipleObjects, } } -int PMInsertPopup::choosePlace( TQWidget* tqparent, bool multipleObjects, +int PMInsertPopup::choosePlace( TQWidget* parent, bool multipleObjects, int items, bool canInsertAllAsFirstChildren, bool canInsertAllAsLastChildren, bool canInsertAllAsSiblings ) { int result; - PMInsertPopup* popup = new PMInsertPopup( tqparent, multipleObjects, items, + PMInsertPopup* popup = new PMInsertPopup( parent, multipleObjects, items, canInsertAllAsFirstChildren, canInsertAllAsLastChildren, canInsertAllAsSiblings ); diff --git a/kpovmodeler/pminsertpopup.h b/kpovmodeler/pminsertpopup.h index 3ec3ecd3..09aa796a 100644 --- a/kpovmodeler/pminsertpopup.h +++ b/kpovmodeler/pminsertpopup.h @@ -39,13 +39,13 @@ public: /** * Creates a popup menu * - * @param tqparent The tqparent widget + * @param parent The parent widget * @param multipleObjects True if more than one object will be inserted * @param items Which items to display. Can be a bitwise combination * of PMIFirstChild, PMILastChild, PMISibling. * @param name Internal name of the popup menu */ - PMInsertPopup( TQWidget* tqparent, bool multipleObjects, + PMInsertPopup( TQWidget* parent, bool multipleObjects, int items = PMIFirstChild | PMILastChild | PMISibling, bool canInsertAllAsFirstChildren = true, bool canInsertAllAsLastChildren = true, @@ -59,7 +59,7 @@ public: /** * Popups a PMInsertPopup menu * - * @param tqparent The tqparent widget + * @param parent The parent widget * @param multipleObjects True if more than one object will be inserted * @param items Which items to display. Can be a bitwise combination * of PMIFirstChild, PMILastChild, PMISibling. @@ -70,7 +70,7 @@ public: * * Returns the selected item or 0 if no item was selected. */ - static int choosePlace( TQWidget* tqparent, bool multipleObjects, + static int choosePlace( TQWidget* parent, bool multipleObjects, int items = PMIFirstChild | PMILastChild | PMISibling, bool canInsertAllAsFirstChildren = true, diff --git a/kpovmodeler/pminsertrulesystem.cpp b/kpovmodeler/pminsertrulesystem.cpp index 0cd2a4d0..7bd9e95a 100644 --- a/kpovmodeler/pminsertrulesystem.cpp +++ b/kpovmodeler/pminsertrulesystem.cpp @@ -767,12 +767,12 @@ bool PMRule::matches( const TQString& className ) return m; } -bool PMRule::evaluate( const PMObject* tqparent ) +bool PMRule::evaluate( const PMObject* parent ) { if( !m_pCondition ) return true; else - return m_pCondition->evaluate( tqparent ); + return m_pCondition->evaluate( parent ); } PMRuleTargetClass::PMRuleTargetClass( TQDomElement& e, diff --git a/kpovmodeler/pminsertrulesystem.h b/kpovmodeler/pminsertrulesystem.h index 2559fdba..e8d30039 100644 --- a/kpovmodeler/pminsertrulesystem.h +++ b/kpovmodeler/pminsertrulesystem.h @@ -535,7 +535,7 @@ public: /** * Returns the conditions value. */ - bool evaluate( const PMObject* tqparent ); + bool evaluate( const PMObject* parent ); private: TQPtrList<PMRuleCategory> m_categories; diff --git a/kpovmodeler/pminterior.cpp b/kpovmodeler/pminterior.cpp index b435ff29..7cc2d87c 100644 --- a/kpovmodeler/pminterior.cpp +++ b/kpovmodeler/pminterior.cpp @@ -281,9 +281,9 @@ void PMInterior::enableFadePower( bool c ) } } -PMDialogEditBase* PMInterior::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMInterior::editWidget( TQWidget* parent ) const { - return new PMInteriorEdit( tqparent ); + return new PMInteriorEdit( parent ); } void PMInterior::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pminterior.h b/kpovmodeler/pminterior.h index 234ad932..4f08ff80 100644 --- a/kpovmodeler/pminterior.h +++ b/kpovmodeler/pminterior.h @@ -65,7 +65,7 @@ public: /** * Returns a new @ref PMInteriorEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pminterior" ); } diff --git a/kpovmodeler/pminterioredit.cpp b/kpovmodeler/pminterioredit.cpp index 0149b01a..d9b427e7 100644 --- a/kpovmodeler/pminterioredit.cpp +++ b/kpovmodeler/pminterioredit.cpp @@ -27,8 +27,8 @@ #include <klocale.h> -PMInteriorEdit::PMInteriorEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMInteriorEdit::PMInteriorEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pminterioredit.h b/kpovmodeler/pminterioredit.h index 9c4c438a..e68a52d5 100644 --- a/kpovmodeler/pminterioredit.h +++ b/kpovmodeler/pminterioredit.h @@ -43,9 +43,9 @@ class PMInteriorEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMInteriorEdit with tqparent and name + * Creates a PMInteriorEdit with parent and name */ - PMInteriorEdit( TQWidget* tqparent, const char* name = 0 ); + PMInteriorEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pminteriortexture.cpp b/kpovmodeler/pminteriortexture.cpp index 3633b2a8..191c3c9b 100644 --- a/kpovmodeler/pminteriortexture.cpp +++ b/kpovmodeler/pminteriortexture.cpp @@ -68,8 +68,8 @@ TQString PMInteriorTexture::description( ) const return i18n( "interior texture" ); } -PMDialogEditBase* PMInteriorTexture::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMInteriorTexture::editWidget( TQWidget* parent ) const { - return new PMInteriorTextureEdit( tqparent ); + return new PMInteriorTextureEdit( parent ); } diff --git a/kpovmodeler/pminteriortexture.h b/kpovmodeler/pminteriortexture.h index 1f84b512..59f37af7 100644 --- a/kpovmodeler/pminteriortexture.h +++ b/kpovmodeler/pminteriortexture.h @@ -59,7 +59,7 @@ public: /** * Returns a new @ref PMTextureEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pminteriortexture" ); } diff --git a/kpovmodeler/pminteriortextureedit.cpp b/kpovmodeler/pminteriortextureedit.cpp index b13d3f7d..73f1e7e9 100644 --- a/kpovmodeler/pminteriortextureedit.cpp +++ b/kpovmodeler/pminteriortextureedit.cpp @@ -25,8 +25,8 @@ #include <klocale.h> -PMInteriorTextureEdit::PMInteriorTextureEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMInteriorTextureEdit::PMInteriorTextureEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pminteriortextureedit.h b/kpovmodeler/pminteriortextureedit.h index a576c926..5f17b2e5 100644 --- a/kpovmodeler/pminteriortextureedit.h +++ b/kpovmodeler/pminteriortextureedit.h @@ -38,9 +38,9 @@ class PMInteriorTextureEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMTextureEdit with tqparent and name + * Creates a PMTextureEdit with parent and name */ - PMInteriorTextureEdit( TQWidget* tqparent, const char* name = 0 ); + PMInteriorTextureEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmisosurface.cpp b/kpovmodeler/pmisosurface.cpp index 94c28886..c47373f8 100644 --- a/kpovmodeler/pmisosurface.cpp +++ b/kpovmodeler/pmisosurface.cpp @@ -333,9 +333,9 @@ void PMIsoSurface::setAllIntersections( bool yes ) } } -PMDialogEditBase* PMIsoSurface::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMIsoSurface::editWidget( TQWidget* parent ) const { - return new PMIsoSurfaceEdit( tqparent ); + return new PMIsoSurfaceEdit( parent ); } void PMIsoSurface::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmisosurface.h b/kpovmodeler/pmisosurface.h index 298f7b26..b9b799a0 100644 --- a/kpovmodeler/pmisosurface.h +++ b/kpovmodeler/pmisosurface.h @@ -69,7 +69,7 @@ public: /** * Returns a new @ref PMIsoSurfaceEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmisosurfaceedit.cpp b/kpovmodeler/pmisosurfaceedit.cpp index 69338bcb..6b775fe4 100644 --- a/kpovmodeler/pmisosurfaceedit.cpp +++ b/kpovmodeler/pmisosurfaceedit.cpp @@ -28,8 +28,8 @@ #include <tqcheckbox.h> #include <klocale.h> -PMIsoSurfaceEdit::PMIsoSurfaceEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMIsoSurfaceEdit::PMIsoSurfaceEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmisosurfaceedit.h b/kpovmodeler/pmisosurfaceedit.h index c0a1dda4..6e6216cc 100644 --- a/kpovmodeler/pmisosurfaceedit.h +++ b/kpovmodeler/pmisosurfaceedit.h @@ -45,9 +45,9 @@ class PMIsoSurfaceEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMIsoSurfaceEdit with tqparent and name + * Creates a PMIsoSurfaceEdit with parent and name */ - PMIsoSurfaceEdit( TQWidget* tqparent, const char* name = 0 ); + PMIsoSurfaceEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmjuliafractal.cpp b/kpovmodeler/pmjuliafractal.cpp index 5a665606..04aaead7 100644 --- a/kpovmodeler/pmjuliafractal.cpp +++ b/kpovmodeler/pmjuliafractal.cpp @@ -272,9 +272,9 @@ void PMJuliaFractal::setExponent( const PMVector& e ) } } -PMDialogEditBase* PMJuliaFractal::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMJuliaFractal::editWidget( TQWidget* parent ) const { - return new PMJuliaFractalEdit( tqparent ); + return new PMJuliaFractalEdit( parent ); } void PMJuliaFractal::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmjuliafractal.h b/kpovmodeler/pmjuliafractal.h index c57df549..1e68a2d3 100644 --- a/kpovmodeler/pmjuliafractal.h +++ b/kpovmodeler/pmjuliafractal.h @@ -72,7 +72,7 @@ public: /** * Returns a new @ref PMJuliaFractalEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmjuliafractaledit.cpp b/kpovmodeler/pmjuliafractaledit.cpp index d0b79e59..4f595b0e 100644 --- a/kpovmodeler/pmjuliafractaledit.cpp +++ b/kpovmodeler/pmjuliafractaledit.cpp @@ -27,8 +27,8 @@ #include <klocale.h> #include <kmessagebox.h> -PMJuliaFractalEdit::PMJuliaFractalEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMJuliaFractalEdit::PMJuliaFractalEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmjuliafractaledit.h b/kpovmodeler/pmjuliafractaledit.h index 21be7989..2beb3e3c 100644 --- a/kpovmodeler/pmjuliafractaledit.h +++ b/kpovmodeler/pmjuliafractaledit.h @@ -43,9 +43,9 @@ class PMJuliaFractalEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMJuliaFractalEdit with tqparent and name + * Creates a PMJuliaFractalEdit with parent and name */ - PMJuliaFractalEdit( TQWidget* tqparent, const char* name = 0 ); + PMJuliaFractalEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmlathe.cpp b/kpovmodeler/pmlathe.cpp index 4418559a..8e058a9b 100644 --- a/kpovmodeler/pmlathe.cpp +++ b/kpovmodeler/pmlathe.cpp @@ -261,9 +261,9 @@ void PMLathe::setPoints( const TQValueList<PMVector>& points ) } } -PMDialogEditBase* PMLathe::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMLathe::editWidget( TQWidget* parent ) const { - return new PMLatheEdit( tqparent ); + return new PMLatheEdit( parent ); } void PMLathe::createMemento( ) diff --git a/kpovmodeler/pmlathe.h b/kpovmodeler/pmlathe.h index d2e0648f..b059b8a8 100644 --- a/kpovmodeler/pmlathe.h +++ b/kpovmodeler/pmlathe.h @@ -74,7 +74,7 @@ public: /** * Returns a new @ref PMLatheEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmlatheedit.cpp b/kpovmodeler/pmlatheedit.cpp index c048d095..e90a4397 100644 --- a/kpovmodeler/pmlatheedit.cpp +++ b/kpovmodeler/pmlatheedit.cpp @@ -33,8 +33,8 @@ #include <kiconloader.h> #include <kmessagebox.h> -PMLatheEdit::PMLatheEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMLatheEdit::PMLatheEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmlatheedit.h b/kpovmodeler/pmlatheedit.h index c33a9711..83a0a4ec 100644 --- a/kpovmodeler/pmlatheedit.h +++ b/kpovmodeler/pmlatheedit.h @@ -47,9 +47,9 @@ class PMLatheEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMLatheEdit with tqparent and name + * Creates a PMLatheEdit with parent and name */ - PMLatheEdit( TQWidget* tqparent, const char* name = 0 ); + PMLatheEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmlayoutsettings.cpp b/kpovmodeler/pmlayoutsettings.cpp index 578391c8..df3c13d3 100644 --- a/kpovmodeler/pmlayoutsettings.cpp +++ b/kpovmodeler/pmlayoutsettings.cpp @@ -31,8 +31,8 @@ #include <klocale.h> #include <kmessagebox.h> -PMLayoutSettings::PMLayoutSettings( TQWidget* tqparent, const char* name ) - : PMSettingsDialogPage( tqparent, name ) +PMLayoutSettings::PMLayoutSettings( TQWidget* parent, const char* name ) + : PMSettingsDialogPage( parent, name ) { TQHBoxLayout* htqlayout; TQVBoxLayout* vtqlayout; diff --git a/kpovmodeler/pmlayoutsettings.h b/kpovmodeler/pmlayoutsettings.h index a7c8401c..856b423d 100644 --- a/kpovmodeler/pmlayoutsettings.h +++ b/kpovmodeler/pmlayoutsettings.h @@ -45,7 +45,7 @@ public: /** * Default constructor */ - PMLayoutSettings( TQWidget* tqparent, const char* name = 0 ); + PMLayoutSettings( TQWidget* parent, const char* name = 0 ); /** */ virtual void displaySettings( ); /** */ diff --git a/kpovmodeler/pmlibrarybrowser.cpp b/kpovmodeler/pmlibrarybrowser.cpp index 6ccfb077..bc7e1af7 100644 --- a/kpovmodeler/pmlibrarybrowser.cpp +++ b/kpovmodeler/pmlibrarybrowser.cpp @@ -47,9 +47,9 @@ // ************** PMLibraryBrowser ************************** -PMLibraryBrowserView::PMLibraryBrowserView( PMPart* /*part*/, TQWidget* tqparent /*= 0*/, +PMLibraryBrowserView::PMLibraryBrowserView( PMPart* /*part*/, TQWidget* parent /*= 0*/, const char* name /*=0*/ ) - : PMViewBase( tqparent, name ) + : PMViewBase( parent, name ) { TQHBoxLayout* hl = new TQHBoxLayout( this ); PMLibraryBrowserViewWidget* tv = new PMLibraryBrowserViewWidget( this ); @@ -61,8 +61,8 @@ TQString PMLibraryBrowserView::description( ) const return i18n( "Library View" ); } -PMLibraryBrowserViewWidget::PMLibraryBrowserViewWidget( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +PMLibraryBrowserViewWidget::PMLibraryBrowserViewWidget( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { setCaption( i18n( "Library Objects" ) ); diff --git a/kpovmodeler/pmlibrarybrowser.h b/kpovmodeler/pmlibrarybrowser.h index 7c8a1899..a094d199 100644 --- a/kpovmodeler/pmlibrarybrowser.h +++ b/kpovmodeler/pmlibrarybrowser.h @@ -53,7 +53,7 @@ public: /** * Default constructor */ - PMLibraryBrowserView( PMPart* part, TQWidget* tqparent, const char* name = 0 ); + PMLibraryBrowserView( PMPart* part, TQWidget* parent, const char* name = 0 ); /** */ virtual TQString viewType( ) const { return TQString( "librarybrowserview" ); } @@ -69,7 +69,7 @@ class PMLibraryBrowserViewWidget: public TQWidget Q_OBJECT TQ_OBJECT public: - PMLibraryBrowserViewWidget( TQWidget *tqparent, const char* name = NULL ); + PMLibraryBrowserViewWidget( TQWidget *parent, const char* name = NULL ); private slots: void resizeEvent( TQResizeEvent* ev ); @@ -112,9 +112,9 @@ public: virtual TQString viewType( ) const { return TQString( "librarybrowserview" ); } virtual TQString description( ) const; virtual TQString iconName( ) const { return TQString( "pmlibrarybrowserview" ); } - virtual PMViewBase* newInstance( TQWidget* tqparent, PMPart* part ) const + virtual PMViewBase* newInstance( TQWidget* parent, PMPart* part ) const { - return new PMLibraryBrowserView( part, tqparent ); + return new PMLibraryBrowserView( part, parent ); } }; diff --git a/kpovmodeler/pmlibraryentrypreview.cpp b/kpovmodeler/pmlibraryentrypreview.cpp index c2d90cdd..a1ea53a1 100644 --- a/kpovmodeler/pmlibraryentrypreview.cpp +++ b/kpovmodeler/pmlibraryentrypreview.cpp @@ -39,8 +39,8 @@ #include <kmessagebox.h> #include <kfiledialog.h> -PMLibraryEntryPreview::PMLibraryEntryPreview( TQWidget* tqparent ) : - TQWidget( tqparent ) +PMLibraryEntryPreview::PMLibraryEntryPreview( TQWidget* parent ) : + TQWidget( parent ) { setAcceptDrops( true ); m_pPart = new PMPart( this, "treeview", NULL, "part", false, true ); diff --git a/kpovmodeler/pmlibraryentrypreview.h b/kpovmodeler/pmlibraryentrypreview.h index 35ef5d52..c269a2c1 100644 --- a/kpovmodeler/pmlibraryentrypreview.h +++ b/kpovmodeler/pmlibraryentrypreview.h @@ -45,7 +45,7 @@ class PMLibraryEntryPreview: public TQWidget TQ_OBJECT public: /** Constructor */ - PMLibraryEntryPreview( TQWidget *tqparent ); + PMLibraryEntryPreview( TQWidget *parent ); /** Destructor */ ~PMLibraryEntryPreview( ); diff --git a/kpovmodeler/pmlibraryhandle.h b/kpovmodeler/pmlibraryhandle.h index e20d6368..353b7b53 100644 --- a/kpovmodeler/pmlibraryhandle.h +++ b/kpovmodeler/pmlibraryhandle.h @@ -180,8 +180,8 @@ public: bool isSubLibrary( ) const { return m_subLibrary; } /** - * Changes the tqparent library if this is a sub library - * @param parentPath The new tqparent path for this library + * Changes the parent library if this is a sub library + * @param parentPath The new parent path for this library * @return PMLibraryHandle::Ok if successful or the reason for failure */ PMLibraryHandle::PMResult changeParentLibrary( const TQString& parentPath ); diff --git a/kpovmodeler/pmlibraryhandleedit.cpp b/kpovmodeler/pmlibraryhandleedit.cpp index d29c1c1f..e991af6e 100644 --- a/kpovmodeler/pmlibraryhandleedit.cpp +++ b/kpovmodeler/pmlibraryhandleedit.cpp @@ -36,8 +36,8 @@ TQSize PMLibraryHandleEdit::s_size = TQSize( 600, 400 ); -PMLibraryHandleEdit::PMLibraryHandleEdit( PMLibraryHandle* lib, TQWidget* tqparent, const char* name ) - : KDialogBase( tqparent, name, true, i18n( "Create Library" ), +PMLibraryHandleEdit::PMLibraryHandleEdit( PMLibraryHandle* lib, TQWidget* parent, const char* name ) + : KDialogBase( parent, name, true, i18n( "Create Library" ), Ok | Cancel, Ok ) { m_pLibrary = lib; diff --git a/kpovmodeler/pmlibraryhandleedit.h b/kpovmodeler/pmlibraryhandleedit.h index 77e3f0bd..88c7ed2c 100644 --- a/kpovmodeler/pmlibraryhandleedit.h +++ b/kpovmodeler/pmlibraryhandleedit.h @@ -43,7 +43,7 @@ public: * Construct a dialog to edit the properties of lib. The library will be * modified only if Ok is pressed. */ - PMLibraryHandleEdit( PMLibraryHandle* lib, TQWidget *tqparent = NULL, const char* name = NULL ); + PMLibraryHandleEdit( PMLibraryHandle* lib, TQWidget *parent = NULL, const char* name = NULL ); static void saveConfig( KConfig* cfg ); static void restoreConfig( KConfig* cfg ); diff --git a/kpovmodeler/pmlibraryiconview.cpp b/kpovmodeler/pmlibraryiconview.cpp index 16778e76..39714cf8 100644 --- a/kpovmodeler/pmlibraryiconview.cpp +++ b/kpovmodeler/pmlibraryiconview.cpp @@ -104,8 +104,8 @@ void PMLibraryIconDrag::append( const TQIconDragItem &item, const TQRect &pr, m_subLibs.append( isSubLibrary ); } -PMLibraryIconView::PMLibraryIconView( TQWidget* tqparent, const char* name ) - : KIconView( tqparent, name ) +PMLibraryIconView::PMLibraryIconView( TQWidget* parent, const char* name ) + : KIconView( parent, name ) { m_pLibrary = NULL; m_pCurrentLibrary = NULL; @@ -192,15 +192,15 @@ TQDragObject* PMLibraryIconView::dragObject( ) return drag; } -PMLibraryIconViewItem::PMLibraryIconViewItem( TQIconView *tqparent, const TQString &text, const TQString& path, bool isSubLibrary ) - : KIconViewItem( tqparent, text ) +PMLibraryIconViewItem::PMLibraryIconViewItem( TQIconView *parent, const TQString &text, const TQString& path, bool isSubLibrary ) + : KIconViewItem( parent, text ) { m_path = path; m_isSubLibrary = isSubLibrary; } -PMLibraryIconViewItem::PMLibraryIconViewItem( TQIconView *tqparent, const TQString &text, const TQImage& image, const TQString& path, bool isSubLibrary ) - : KIconViewItem( tqparent, text, image ) +PMLibraryIconViewItem::PMLibraryIconViewItem( TQIconView *parent, const TQString &text, const TQImage& image, const TQString& path, bool isSubLibrary ) + : KIconViewItem( parent, text, image ) { m_path = path; m_isSubLibrary = isSubLibrary; diff --git a/kpovmodeler/pmlibraryiconview.h b/kpovmodeler/pmlibraryiconview.h index 84d4f5b0..dc297c26 100644 --- a/kpovmodeler/pmlibraryiconview.h +++ b/kpovmodeler/pmlibraryiconview.h @@ -65,7 +65,7 @@ class PMLibraryIconView: public KIconView Q_OBJECT TQ_OBJECT public: - PMLibraryIconView( TQWidget *tqparent, const char* name = NULL ); + PMLibraryIconView( TQWidget *parent, const char* name = NULL ); /** * Set the library base path @@ -101,8 +101,8 @@ private: class PMLibraryIconViewItem: public KIconViewItem { public: - PMLibraryIconViewItem( TQIconView *tqparent, const TQString& text, const TQString& path, bool isSubLibrary ); - PMLibraryIconViewItem( TQIconView *tqparent, const TQString& text, const TQImage& image, const TQString& path, bool isSubLibrary ); + PMLibraryIconViewItem( TQIconView *parent, const TQString& text, const TQString& path, bool isSubLibrary ); + PMLibraryIconViewItem( TQIconView *parent, const TQString& text, const TQImage& image, const TQString& path, bool isSubLibrary ); /** Get the path of the entry */ TQString path( ) const { return m_path; } diff --git a/kpovmodeler/pmlibraryobjectsearch.cpp b/kpovmodeler/pmlibraryobjectsearch.cpp index 9df12dac..30e5be5c 100644 --- a/kpovmodeler/pmlibraryobjectsearch.cpp +++ b/kpovmodeler/pmlibraryobjectsearch.cpp @@ -34,8 +34,8 @@ #include <kdialog.h> #include <klistview.h> -PMLibraryObjectSearch::PMLibraryObjectSearch( TQWidget* tqparent ) : - TQWidget( tqparent, "" ) +PMLibraryObjectSearch::PMLibraryObjectSearch( TQWidget* parent ) : + TQWidget( parent, "" ) { setMinimumSize( 780, 300 ); setMaximumSize( 800, 400 ); diff --git a/kpovmodeler/pmlibraryobjectsearch.h b/kpovmodeler/pmlibraryobjectsearch.h index 318735e4..bc9ac714 100644 --- a/kpovmodeler/pmlibraryobjectsearch.h +++ b/kpovmodeler/pmlibraryobjectsearch.h @@ -41,7 +41,7 @@ class PMLibraryObjectSearch: public TQWidget Q_OBJECT TQ_OBJECT public: - PMLibraryObjectSearch( TQWidget *tqparent ); + PMLibraryObjectSearch( TQWidget *parent ); private slots: void slotSearchButtonPressed( ); diff --git a/kpovmodeler/pmlight.cpp b/kpovmodeler/pmlight.cpp index 0bf2f005..22f1862d 100644 --- a/kpovmodeler/pmlight.cpp +++ b/kpovmodeler/pmlight.cpp @@ -564,9 +564,9 @@ void PMLight::setMediaAttenuation( bool y ) } } -PMDialogEditBase* PMLight::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMLight::editWidget( TQWidget* parent ) const { - return new PMLightEdit( tqparent ); + return new PMLightEdit( parent ); } void PMLight::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmlight.h b/kpovmodeler/pmlight.h index 4ceb0268..59053ab8 100644 --- a/kpovmodeler/pmlight.h +++ b/kpovmodeler/pmlight.h @@ -69,7 +69,7 @@ public: /** * Returns a new @ref PMLightEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the name of the pixmap that is displayed in the tree view * and dialog view diff --git a/kpovmodeler/pmlightedit.cpp b/kpovmodeler/pmlightedit.cpp index 70625c00..e652d0a2 100644 --- a/kpovmodeler/pmlightedit.cpp +++ b/kpovmodeler/pmlightedit.cpp @@ -29,8 +29,8 @@ #include <klocale.h> -PMLightEdit::PMLightEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMLightEdit::PMLightEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmlightedit.h b/kpovmodeler/pmlightedit.h index 75b56530..d3a595c5 100644 --- a/kpovmodeler/pmlightedit.h +++ b/kpovmodeler/pmlightedit.h @@ -45,9 +45,9 @@ class PMLightEdit : public PMNamedObjectEdit typedef PMNamedObjectEdit Base; public: /** - * Creates a PMLightEdit with tqparent and name + * Creates a PMLightEdit with parent and name */ - PMLightEdit( TQWidget* tqparent, const char* name = 0 ); + PMLightEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmlightgroup.cpp b/kpovmodeler/pmlightgroup.cpp index af46e823..36f8d17a 100644 --- a/kpovmodeler/pmlightgroup.cpp +++ b/kpovmodeler/pmlightgroup.cpp @@ -103,9 +103,9 @@ void PMLightGroup::setGlobalLights( bool gl ) } } -PMDialogEditBase* PMLightGroup::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMLightGroup::editWidget( TQWidget* parent ) const { - return new PMLightGroupEdit( tqparent ); + return new PMLightGroupEdit( parent ); } void PMLightGroup::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmlightgroup.h b/kpovmodeler/pmlightgroup.h index 9c9de8b3..11762efa 100644 --- a/kpovmodeler/pmlightgroup.h +++ b/kpovmodeler/pmlightgroup.h @@ -66,7 +66,7 @@ public: /** * Returns a new @ref PMLightGroupEdit */ - 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/pmlightgroupedit.cpp b/kpovmodeler/pmlightgroupedit.cpp index 87f35ff0..73a75c6d 100644 --- a/kpovmodeler/pmlightgroupedit.cpp +++ b/kpovmodeler/pmlightgroupedit.cpp @@ -24,8 +24,8 @@ #include <tqcheckbox.h> #include <klocale.h> -PMLightGroupEdit::PMLightGroupEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMLightGroupEdit::PMLightGroupEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmlightgroupedit.h b/kpovmodeler/pmlightgroupedit.h index 8b1216fd..6a418bee 100644 --- a/kpovmodeler/pmlightgroupedit.h +++ b/kpovmodeler/pmlightgroupedit.h @@ -39,9 +39,9 @@ class PMLightGroupEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMLightGroupEdit with tqparent and name + * Creates a PMLightGroupEdit with parent and name */ - PMLightGroupEdit( TQWidget* tqparent, const char* name = 0 ); + PMLightGroupEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmlineedits.cpp b/kpovmodeler/pmlineedits.cpp index e6e350b6..7546894e 100644 --- a/kpovmodeler/pmlineedits.cpp +++ b/kpovmodeler/pmlineedits.cpp @@ -19,8 +19,8 @@ #include <kmessagebox.h> #include <klocale.h> -PMFloatEdit::PMFloatEdit( TQWidget* tqparent, const char* name /*= 0*/ ) - : TQLineEdit( tqparent, name ) +PMFloatEdit::PMFloatEdit( TQWidget* parent, const char* name /*= 0*/ ) + : TQLineEdit( parent, name ) { m_bCheckLower = false; m_bCheckUpper = false; @@ -129,8 +129,8 @@ void PMFloatEdit::slotEditTextChanged( const TQString& /*t*/ ) -PMIntEdit::PMIntEdit( TQWidget* tqparent, const char* name /*= 0*/ ) - : TQLineEdit( tqparent, name ) +PMIntEdit::PMIntEdit( TQWidget* parent, const char* name /*= 0*/ ) + : TQLineEdit( parent, name ) { m_bCheckLower = false; m_bCheckUpper = false; diff --git a/kpovmodeler/pmlineedits.h b/kpovmodeler/pmlineedits.h index 0db5619e..87cafaa7 100644 --- a/kpovmodeler/pmlineedits.h +++ b/kpovmodeler/pmlineedits.h @@ -39,7 +39,7 @@ public: /** * Simple constructor */ - PMFloatEdit( TQWidget* tqparent, const char* name = 0 ); + PMFloatEdit( TQWidget* parent, const char* name = 0 ); /** * Sets the validation for the lineedit. * @@ -96,7 +96,7 @@ public: /** * Simple constructor */ - PMIntEdit( TQWidget* tqparent, const char* name = 0 ); + PMIntEdit( TQWidget* parent, const char* name = 0 ); /** * Sets the validation for the lineedit. * diff --git a/kpovmodeler/pmlinkedit.cpp b/kpovmodeler/pmlinkedit.cpp index 2114c5fa..87f6203c 100644 --- a/kpovmodeler/pmlinkedit.cpp +++ b/kpovmodeler/pmlinkedit.cpp @@ -28,23 +28,23 @@ #include "pmobjectselect.h" PMLinkEdit::PMLinkEdit( const TQString& declareType, - TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) + TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { m_declareTypes.append( declareType ); init( ); } PMLinkEdit::PMLinkEdit( const TQStringList& declareTypes, - TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) + TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { m_declareTypes = declareTypes; init( ); } -PMLinkEdit::PMLinkEdit( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +PMLinkEdit::PMLinkEdit( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { init( ); } diff --git a/kpovmodeler/pmlinkedit.h b/kpovmodeler/pmlinkedit.h index 935d8940..7c0b7451 100644 --- a/kpovmodeler/pmlinkedit.h +++ b/kpovmodeler/pmlinkedit.h @@ -37,21 +37,21 @@ class PMLinkEdit : public TQWidget TQ_OBJECT public: /** - * Creates a link edit widget with tqparent and name. + * Creates a link edit widget with parent and name. * * Allows the selection of declares of type declareType. */ - PMLinkEdit( const TQString& declareType, TQWidget* tqparent, const char* name = 0 ); + PMLinkEdit( const TQString& declareType, TQWidget* parent, const char* name = 0 ); /** - * Creates a link edit widget with tqparent and name. + * Creates a link edit widget with parent and name. * * Allows the selection of declares of type declares. */ - PMLinkEdit( const TQStringList& declares, TQWidget* tqparent, const char* name = 0 ); + PMLinkEdit( const TQStringList& declares, TQWidget* parent, const char* name = 0 ); /** - * Creates a link edit widget with tqparent and name. + * Creates a link edit widget with parent and name. */ - PMLinkEdit( TQWidget* tqparent, const char* name = 0 ); + PMLinkEdit( TQWidget* parent, const char* name = 0 ); /** * Sets the displayed object and displays the link diff --git a/kpovmodeler/pmlistpattern.cpp b/kpovmodeler/pmlistpattern.cpp index 5a7a3f1f..3d368209 100644 --- a/kpovmodeler/pmlistpattern.cpp +++ b/kpovmodeler/pmlistpattern.cpp @@ -178,9 +178,9 @@ void PMListPattern::setMortar( double n ) } } -PMDialogEditBase* PMListPattern::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMListPattern::editWidget( TQWidget* parent ) const { - return new PMListPatternEdit( tqparent ); + return new PMListPatternEdit( parent ); } void PMListPattern::restoreMemento( PMMemento* s ) @@ -462,8 +462,8 @@ void PMNormalList::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMDialogEditBase* PMNormalList::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMNormalList::editWidget( TQWidget* parent ) const { - return new PMListPatternEdit( tqparent ); + return new PMListPatternEdit( parent ); } diff --git a/kpovmodeler/pmlistpattern.h b/kpovmodeler/pmlistpattern.h index 6c8a26a1..876c8c15 100644 --- a/kpovmodeler/pmlistpattern.h +++ b/kpovmodeler/pmlistpattern.h @@ -69,7 +69,7 @@ public: /** * Returns a new @ref PMListPatternEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Returns the color list type @@ -313,7 +313,7 @@ public: /** * Returns a new @ref PMListPatternEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmnormallist" ); } diff --git a/kpovmodeler/pmlistpatternedit.cpp b/kpovmodeler/pmlistpatternedit.cpp index 240d87d2..bc897c61 100644 --- a/kpovmodeler/pmlistpatternedit.cpp +++ b/kpovmodeler/pmlistpatternedit.cpp @@ -31,8 +31,8 @@ #include <kmessagebox.h> -PMListPatternEdit::PMListPatternEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMListPatternEdit::PMListPatternEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmlistpatternedit.h b/kpovmodeler/pmlistpatternedit.h index 4e80e4d8..4b34ee93 100644 --- a/kpovmodeler/pmlistpatternedit.h +++ b/kpovmodeler/pmlistpatternedit.h @@ -42,9 +42,9 @@ class PMListPatternEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMListPatternEdit with tqparent and name + * Creates a PMListPatternEdit with parent and name */ - PMListPatternEdit( TQWidget* tqparent, const char* name = 0 ); + PMListPatternEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmlookslike.cpp b/kpovmodeler/pmlookslike.cpp index 2717c531..f6cd5d29 100644 --- a/kpovmodeler/pmlookslike.cpp +++ b/kpovmodeler/pmlookslike.cpp @@ -80,9 +80,9 @@ void PMLooksLike::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMDialogEditBase* PMLooksLike::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMLooksLike::editWidget( TQWidget* parent ) const { - return new PMNamedObjectEdit( tqparent ); + return new PMNamedObjectEdit( parent ); } void PMLooksLike::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmlookslike.h b/kpovmodeler/pmlookslike.h index 30127a6a..9e9c9d92 100644 --- a/kpovmodeler/pmlookslike.h +++ b/kpovmodeler/pmlookslike.h @@ -64,7 +64,7 @@ public: /** * Returns a new @ref PMLooksLikeEdit */ - 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/pmmaterial.cpp b/kpovmodeler/pmmaterial.cpp index 8eb8866f..b37d98bb 100644 --- a/kpovmodeler/pmmaterial.cpp +++ b/kpovmodeler/pmmaterial.cpp @@ -68,8 +68,8 @@ TQString PMMaterial::description( ) const return i18n( "material" ); } -PMDialogEditBase* PMMaterial::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMMaterial::editWidget( TQWidget* parent ) const { - return new PMMaterialEdit( tqparent ); + return new PMMaterialEdit( parent ); } diff --git a/kpovmodeler/pmmaterial.h b/kpovmodeler/pmmaterial.h index 6e092aed..955e4515 100644 --- a/kpovmodeler/pmmaterial.h +++ b/kpovmodeler/pmmaterial.h @@ -59,7 +59,7 @@ public: /** * Returns a new @ref PMMaterialEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmmaterial" ); } diff --git a/kpovmodeler/pmmaterialedit.cpp b/kpovmodeler/pmmaterialedit.cpp index 4500e947..f03fcd43 100644 --- a/kpovmodeler/pmmaterialedit.cpp +++ b/kpovmodeler/pmmaterialedit.cpp @@ -25,8 +25,8 @@ #include <klocale.h> -PMMaterialEdit::PMMaterialEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMMaterialEdit::PMMaterialEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmmaterialedit.h b/kpovmodeler/pmmaterialedit.h index 0671d3a7..fa9ee842 100644 --- a/kpovmodeler/pmmaterialedit.h +++ b/kpovmodeler/pmmaterialedit.h @@ -38,9 +38,9 @@ class PMMaterialEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMMaterialEdit with tqparent and name + * Creates a PMMaterialEdit with parent and name */ - PMMaterialEdit( TQWidget* tqparent, const char* name = 0 ); + PMMaterialEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmmaterialmap.cpp b/kpovmodeler/pmmaterialmap.cpp index faffd857..8ef5dc93 100644 --- a/kpovmodeler/pmmaterialmap.cpp +++ b/kpovmodeler/pmmaterialmap.cpp @@ -296,9 +296,9 @@ void PMMaterialMap::enableOnce( bool c ) } } -PMDialogEditBase* PMMaterialMap::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMMaterialMap::editWidget( TQWidget* parent ) const { - return new PMMaterialMapEdit( tqparent ); + return new PMMaterialMapEdit( parent ); } void PMMaterialMap::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmmaterialmap.h b/kpovmodeler/pmmaterialmap.h index 6f810274..f5cc3ca9 100644 --- a/kpovmodeler/pmmaterialmap.h +++ b/kpovmodeler/pmmaterialmap.h @@ -87,7 +87,7 @@ public: /** * Returns a new @ref PMMaterialMapEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Gets the bitmap type diff --git a/kpovmodeler/pmmaterialmapedit.cpp b/kpovmodeler/pmmaterialmapedit.cpp index 93c61405..491f9d76 100644 --- a/kpovmodeler/pmmaterialmapedit.cpp +++ b/kpovmodeler/pmmaterialmapedit.cpp @@ -38,8 +38,8 @@ #include <kfiledialog.h> #include <kiconloader.h> -PMMaterialMapEdit::PMMaterialMapEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMMaterialMapEdit::PMMaterialMapEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmmaterialmapedit.h b/kpovmodeler/pmmaterialmapedit.h index e1d4e9f3..c1cb3bec 100644 --- a/kpovmodeler/pmmaterialmapedit.h +++ b/kpovmodeler/pmmaterialmapedit.h @@ -46,9 +46,9 @@ class PMMaterialMapEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMMaterialMapEdit with tqparent and name + * Creates a PMMaterialMapEdit with parent and name */ - PMMaterialMapEdit( TQWidget* tqparent, const char* name = 0 ); + PMMaterialMapEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); /** */ diff --git a/kpovmodeler/pmmedia.cpp b/kpovmodeler/pmmedia.cpp index b149b84d..e487d6e9 100644 --- a/kpovmodeler/pmmedia.cpp +++ b/kpovmodeler/pmmedia.cpp @@ -399,9 +399,9 @@ void PMMedia::enableScattering( bool c ) } } -PMDialogEditBase* PMMedia::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMMedia::editWidget( TQWidget* parent ) const { - return new PMMediaEdit( tqparent ); + return new PMMediaEdit( parent ); } void PMMedia::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmmedia.h b/kpovmodeler/pmmedia.h index e984bebd..78adc338 100644 --- a/kpovmodeler/pmmedia.h +++ b/kpovmodeler/pmmedia.h @@ -65,7 +65,7 @@ public: /** * Returns a new @ref PMMediaEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmmedia" ); } diff --git a/kpovmodeler/pmmediaedit.cpp b/kpovmodeler/pmmediaedit.cpp index 0f63b009..f89f7d10 100644 --- a/kpovmodeler/pmmediaedit.cpp +++ b/kpovmodeler/pmmediaedit.cpp @@ -29,8 +29,8 @@ #include <kmessagebox.h> #include <kdialog.h> -PMMediaEdit::PMMediaEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMMediaEdit::PMMediaEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmmediaedit.h b/kpovmodeler/pmmediaedit.h index 021a5b77..275d7029 100644 --- a/kpovmodeler/pmmediaedit.h +++ b/kpovmodeler/pmmediaedit.h @@ -44,9 +44,9 @@ class PMMediaEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMMediaEdit with tqparent and name + * Creates a PMMediaEdit with parent and name */ - PMMediaEdit( TQWidget* tqparent, const char* name = 0 ); + PMMediaEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmmesh.cpp b/kpovmodeler/pmmesh.cpp index a56ea635..fc1791bf 100644 --- a/kpovmodeler/pmmesh.cpp +++ b/kpovmodeler/pmmesh.cpp @@ -189,9 +189,9 @@ void PMMesh::setInsideVector( const PMVector& iv ) } } -PMDialogEditBase* PMMesh::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMMesh::editWidget( TQWidget* parent ) const { - return new PMMeshEdit( tqparent ); + return new PMMeshEdit( parent ); } void PMMesh::createMemento( ) diff --git a/kpovmodeler/pmmesh.h b/kpovmodeler/pmmesh.h index 74155060..6c1c6054 100644 --- a/kpovmodeler/pmmesh.h +++ b/kpovmodeler/pmmesh.h @@ -68,7 +68,7 @@ public: /** * Returns a new @ref PMMeshEdit */ - 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/pmmeshedit.cpp b/kpovmodeler/pmmeshedit.cpp index 09285268..61bea7a1 100644 --- a/kpovmodeler/pmmeshedit.cpp +++ b/kpovmodeler/pmmeshedit.cpp @@ -25,8 +25,8 @@ #include <klocale.h> -PMMeshEdit::PMMeshEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMMeshEdit::PMMeshEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmmeshedit.h b/kpovmodeler/pmmeshedit.h index e9d71054..83b9d161 100644 --- a/kpovmodeler/pmmeshedit.h +++ b/kpovmodeler/pmmeshedit.h @@ -40,9 +40,9 @@ class PMMeshEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMMeshEdit with tqparent and name + * Creates a PMMeshEdit with parent and name */ - PMMeshEdit( TQWidget* tqparent, const char* name = 0 ); + PMMeshEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmmovecommand.cpp b/kpovmodeler/pmmovecommand.cpp index 124de7a3..7f14e871 100644 --- a/kpovmodeler/pmmovecommand.cpp +++ b/kpovmodeler/pmmovecommand.cpp @@ -29,19 +29,19 @@ #include <klocale.h> #include <tqptrdict.h> -PMMoveCommand::PMMoveCommand( PMObject* obj, PMObject* tqparent, PMObject* after ) +PMMoveCommand::PMMoveCommand( PMObject* obj, PMObject* parent, PMObject* after ) : PMCommand( i18n( "Move %1" ).tqarg( obj->description( ) ) ) { - m_pParent = tqparent; + m_pParent = parent; m_pAfter = after; - 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( ) ) @@ -52,7 +52,7 @@ PMMoveCommand::PMMoveCommand( PMObject* obj, PMObject* tqparent, PMObject* after m_firstExecution = true; } -PMMoveCommand::PMMoveCommand( const PMObjectList& list, PMObject* tqparent, +PMMoveCommand::PMMoveCommand( const PMObjectList& list, PMObject* parent, PMObject* after ) : PMCommand( i18n( "Move Objects" ) ) { @@ -60,11 +60,11 @@ PMMoveCommand::PMMoveCommand( const PMObjectList& list, PMObject* tqparent, for( ; it.current( ); ++it ) { - if( it.current( )->tqparent( ) ) + if( it.current( )->parent( ) ) m_infoList.append( new PMDeleteInfo( it.current( ) ) ); else { - // object has no tqparent! + // object has no parent! // top level objects can't be moved, move all child items PMObject* tmp; for( tmp = it.current( )->firstChild( ); tmp; tmp = tmp->nextSibling( ) ) @@ -72,7 +72,7 @@ PMMoveCommand::PMMoveCommand( const PMObjectList& list, PMObject* tqparent, } } - m_pParent = tqparent; + m_pParent = parent; m_pAfter = after; m_executed = false; m_firstExecution = true; @@ -97,19 +97,19 @@ void PMMoveCommand::execute( PMCommandManager* theManager ) PMObject* obj; bool error = false; PMDeleteInfo* info = 0; - PMObject* tqparent; + PMObject* parent; 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( ) ); } // insert at new position @@ -165,10 +165,10 @@ void PMMoveCommand::execute( PMCommandManager* theManager ) for( it.toLast( ); it.current( ); --it ) { info = it.current( ); - tqparent = info->tqparent( ); + parent = info->parent( ); - if( tqparent->mementoCreated( ) ) - m_dataChanges.append( tqparent->takeMemento( ) ); + if( parent->mementoCreated( ) ) + m_dataChanges.append( parent->takeMemento( ) ); } } @@ -197,18 +197,18 @@ void PMMoveCommand::undo( PMCommandManager* theManager ) // signal has to be emitted before the item is removed obj = it.current( )->deletedObject( ); theManager->cmdObjectChanged( obj, PMCRemove ); - if( obj->tqparent( ) ) - obj->tqparent( )->takeChild( obj ); + if( obj->parent( ) ) + obj->parent( )->takeChild( obj ); } for( it.toFirst( ); it.current( ); ++it ) { obj = it.current( )->deletedObject( ); if( it.current( )->prevSibling( ) ) - it.current( )->tqparent( ) + it.current( )->parent( ) ->insertChildAfter( obj, it.current( )->prevSibling( ) ); else - it.current( )->tqparent( )->insertChild( obj, 0 ); + it.current( )->parent( )->insertChild( obj, 0 ); theManager->cmdObjectChanged( obj, PMCAdd ); } @@ -279,7 +279,7 @@ int PMMoveCommand::errorFlags( PMPart* ) { insideSelection = false; for( obj = links.current( ); obj && !insideSelection; - obj = obj->tqparent( ) ) + obj = obj->parent( ) ) { if( deletedObjects.find( obj ) ) insideSelection = true; @@ -288,7 +288,7 @@ int PMMoveCommand::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( deletedObjects.find( obj ) ) stop = true; @@ -305,17 +305,17 @@ int PMMoveCommand::errorFlags( PMPart* ) if( m_pAfter ) { // insert point is not the first item - // find the top level tqparent item + // find the top level parent item stop = false; obj = links.current( ); do { - if( obj->tqparent( ) ) + if( obj->parent( ) ) { - if( obj->tqparent( )->type( ) == "Scene" ) + if( obj->parent( )->type( ) == "Scene" ) stop = true; else - obj = obj->tqparent( ); + obj = obj->parent( ); } else stop = true; // error @@ -325,7 +325,7 @@ int PMMoveCommand::errorFlags( PMPart* ) PMObject* topParent = obj; // check if insert point is before the top level - // tqparent object + // parent object if( !objectsAfterInsertPosition.find( obj ) ) { @@ -383,12 +383,12 @@ int PMMoveCommand::errorFlags( PMPart* ) obj = m_pParent; do { - if( obj->tqparent( ) ) + if( obj->parent( ) ) { - if( obj->tqparent( )->type( ) == "Scene" ) + if( obj->parent( )->type( ) == "Scene" ) stop = true; else - obj = obj->tqparent( ); + obj = obj->parent( ); } else stop = true; // error diff --git a/kpovmodeler/pmmovecommand.h b/kpovmodeler/pmmovecommand.h index 188d721c..934f7fa4 100644 --- a/kpovmodeler/pmmovecommand.h +++ b/kpovmodeler/pmmovecommand.h @@ -39,23 +39,23 @@ public: /** * Command that moves one 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. */ - PMMoveCommand( PMObject* obj, PMObject* tqparent, PMObject* after ); + PMMoveCommand( PMObject* obj, PMObject* parent, PMObject* after ); /** * Command that moves a list of new PMObjects. * The objects don't have to be siblings of each other. * - * 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. */ - PMMoveCommand( const PMObjectList& list, PMObject* tqparent, PMObject* after ); + PMMoveCommand( const PMObjectList& list, PMObject* parent, PMObject* after ); /** * Deletes the command. */ diff --git a/kpovmodeler/pmnamedobjectedit.cpp b/kpovmodeler/pmnamedobjectedit.cpp index afcbe0d6..f9179f74 100644 --- a/kpovmodeler/pmnamedobjectedit.cpp +++ b/kpovmodeler/pmnamedobjectedit.cpp @@ -24,8 +24,8 @@ #include <tqlabel.h> #include <klocale.h> -PMNamedObjectEdit::PMNamedObjectEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMNamedObjectEdit::PMNamedObjectEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmnamedobjectedit.h b/kpovmodeler/pmnamedobjectedit.h index ce7c8024..fe1def5b 100644 --- a/kpovmodeler/pmnamedobjectedit.h +++ b/kpovmodeler/pmnamedobjectedit.h @@ -39,9 +39,9 @@ class PMNamedObjectEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMNamedObjectEdit with tqparent and name + * Creates a PMNamedObjectEdit with parent and name */ - PMNamedObjectEdit( TQWidget* tqparent, const char* name = 0 ); + PMNamedObjectEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmnormal.cpp b/kpovmodeler/pmnormal.cpp index c2afe835..b6e7bb07 100644 --- a/kpovmodeler/pmnormal.cpp +++ b/kpovmodeler/pmnormal.cpp @@ -109,9 +109,9 @@ void PMNormal::readAttributes( const PMXMLHelper& h ) m_uvMapping = h.boolAttribute( "uv_mapping", false ); } -PMDialogEditBase* PMNormal::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMNormal::editWidget( TQWidget* parent ) const { - return new PMNormalEdit( tqparent ); + return new PMNormalEdit( parent ); } void PMNormal::enableBumpSize( bool c ) diff --git a/kpovmodeler/pmnormal.h b/kpovmodeler/pmnormal.h index 2294b1fc..a179a3ed 100644 --- a/kpovmodeler/pmnormal.h +++ b/kpovmodeler/pmnormal.h @@ -64,7 +64,7 @@ public: /** * Returns a new @ref PMNormalEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmnormal" ); } diff --git a/kpovmodeler/pmnormaledit.cpp b/kpovmodeler/pmnormaledit.cpp index 5d5c6eee..68d6f1f3 100644 --- a/kpovmodeler/pmnormaledit.cpp +++ b/kpovmodeler/pmnormaledit.cpp @@ -27,8 +27,8 @@ #include <klocale.h> -PMNormalEdit::PMNormalEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMNormalEdit::PMNormalEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmnormaledit.h b/kpovmodeler/pmnormaledit.h index f3fa45b7..1f12a45f 100644 --- a/kpovmodeler/pmnormaledit.h +++ b/kpovmodeler/pmnormaledit.h @@ -40,9 +40,9 @@ class PMNormalEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMNormalEdit with tqparent and name + * Creates a PMNormalEdit with parent and name */ - PMNormalEdit( TQWidget* tqparent, const char* name = 0 ); + PMNormalEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmobject.cpp b/kpovmodeler/pmobject.cpp index 71424eaf..579bd00b 100644 --- a/kpovmodeler/pmobject.cpp +++ b/kpovmodeler/pmobject.cpp @@ -142,9 +142,9 @@ bool PMObject::takeChild( uint ) return false; } -PMDialogEditBase* PMObject::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMObject::editWidget( TQWidget* parent ) const { - return new PMDialogEditBase( tqparent ); + return new PMDialogEditBase( parent ); // return 0; } @@ -177,7 +177,7 @@ PMMatrix PMObject::transformedWith( ) const else if( o->nextSibling( ) ) o = o->nextSibling( ); else - o = o->tqparent( ); + o = o->parent( ); while( o ) { @@ -187,7 +187,7 @@ PMMatrix PMObject::transformedWith( ) const if( o->nextSibling( ) ) o = o->nextSibling( ); else - o = o->tqparent( ); + o = o->parent( ); } return result; diff --git a/kpovmodeler/pmobject.h b/kpovmodeler/pmobject.h index 1275f3d9..3bffb7d3 100644 --- a/kpovmodeler/pmobject.h +++ b/kpovmodeler/pmobject.h @@ -61,11 +61,11 @@ class PMObject friend class PMCompositeObject; public: /** - * Creates an empty PMObject without tqparent. + * Creates an empty PMObject without parent. */ PMObject( PMPart* part ); /** - * Copy constructor. All object pointers (tqparent, siblings) are set to 0! + * Copy constructor. All object pointers (parent, siblings) are set to 0! */ PMObject( const PMObject& o ); /** @@ -121,9 +121,9 @@ public: virtual bool exportPovray( ) const { return true; } /** - * Returns a pointer to the tqparent object. + * Returns a pointer to the parent object. */ - PMObject* tqparent( ) const { return m_pParent; } + PMObject* parent( ) const { return m_pParent; } /** * Returns a pointer to the corresponding part */ @@ -385,7 +385,7 @@ public: void setSelected( bool s ); /** * Returns true if this item can be selected. An item cannot be selected - * if a tqparent object is selected + * if a parent object is selected */ bool isSelectable( ); /** @@ -411,9 +411,9 @@ public: * Creates a new edit widget that can display this object and * returns a pointer to it. * - * The widget will be created as a child of tqparent. + * The widget will be created as a child of parent. */ - 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 @@ -470,7 +470,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*/ ) { }; /** @@ -479,7 +479,7 @@ protected: PMMemento* m_pMemento; private: /** - * Pointer to the tqparent object. 0 if the object has no tqparent. + * Pointer to the parent object. 0 if the object has no parent. */ PMObject* m_pParent; /** diff --git a/kpovmodeler/pmobjectlibrarysettings.cpp b/kpovmodeler/pmobjectlibrarysettings.cpp index d57e5949..93f9f419 100644 --- a/kpovmodeler/pmobjectlibrarysettings.cpp +++ b/kpovmodeler/pmobjectlibrarysettings.cpp @@ -33,8 +33,8 @@ #include <kmessagebox.h> #include <kstandarddirs.h> -PMObjectLibrarySettings::PMObjectLibrarySettings( TQWidget* tqparent, const char* name ) - : PMSettingsDialogPage( tqparent, name ) +PMObjectLibrarySettings::PMObjectLibrarySettings( TQWidget* parent, const char* name ) + : PMSettingsDialogPage( parent, name ) { TQVBoxLayout* vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); diff --git a/kpovmodeler/pmobjectlibrarysettings.h b/kpovmodeler/pmobjectlibrarysettings.h index dd9d30ce..be921d26 100644 --- a/kpovmodeler/pmobjectlibrarysettings.h +++ b/kpovmodeler/pmobjectlibrarysettings.h @@ -40,7 +40,7 @@ public: /** * Default constructor */ - PMObjectLibrarySettings( TQWidget* tqparent, const char* name = 0 ); + PMObjectLibrarySettings( TQWidget* parent, const char* name = 0 ); /** */ virtual void displaySettings( ); /** */ diff --git a/kpovmodeler/pmobjectlink.cpp b/kpovmodeler/pmobjectlink.cpp index b6add85b..f99bb92b 100644 --- a/kpovmodeler/pmobjectlink.cpp +++ b/kpovmodeler/pmobjectlink.cpp @@ -167,9 +167,9 @@ void PMObjectLink::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMDialogEditBase* PMObjectLink::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMObjectLink::editWidget( TQWidget* parent ) const { - return new PMObjectLinkEdit( tqparent ); + return new PMObjectLinkEdit( parent ); } void PMObjectLink::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmobjectlink.h b/kpovmodeler/pmobjectlink.h index dce54498..7bc55b59 100644 --- a/kpovmodeler/pmobjectlink.h +++ b/kpovmodeler/pmobjectlink.h @@ -80,7 +80,7 @@ public: /** * Returns a new @ref PMObjectLinkEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmobjectlink" ); } diff --git a/kpovmodeler/pmobjectlinkedit.cpp b/kpovmodeler/pmobjectlinkedit.cpp index c2ddf61b..98aead0c 100644 --- a/kpovmodeler/pmobjectlinkedit.cpp +++ b/kpovmodeler/pmobjectlinkedit.cpp @@ -24,8 +24,8 @@ #include <tqlayout.h> -PMObjectLinkEdit::PMObjectLinkEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMObjectLinkEdit::PMObjectLinkEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmobjectlinkedit.h b/kpovmodeler/pmobjectlinkedit.h index 82ed645d..58313c26 100644 --- a/kpovmodeler/pmobjectlinkedit.h +++ b/kpovmodeler/pmobjectlinkedit.h @@ -39,9 +39,9 @@ class PMObjectLinkEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMObjectLinkEdit with tqparent and name + * Creates a PMObjectLinkEdit with parent and name */ - PMObjectLinkEdit( TQWidget* tqparent, const char* name = 0 ); + PMObjectLinkEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmobjectselect.cpp b/kpovmodeler/pmobjectselect.cpp index e234921a..fcfbb3f5 100644 --- a/kpovmodeler/pmobjectselect.cpp +++ b/kpovmodeler/pmobjectselect.cpp @@ -84,8 +84,8 @@ PMListBoxObject::~PMListBoxObject( ) TQSize PMObjectSelect::s_size = TQSize( 200, 300 ); -PMObjectSelect::PMObjectSelect( TQWidget* tqparent, const char* name, bool modal ) - : KDialogBase( tqparent, name, modal, i18n( "Choose Object" ), Ok | Cancel ) +PMObjectSelect::PMObjectSelect( TQWidget* parent, const char* name, bool modal ) + : KDialogBase( parent, name, modal, i18n( "Choose Object" ), Ok | Cancel ) { m_pSelectedObject = 0; m_pListBox = new TQListBox( this ); @@ -110,7 +110,7 @@ void PMObjectSelect::addObject( PMObject* obj ) } int PMObjectSelect::selectObject( PMObject* link, const TQString& t, - PMObject* & obj, TQWidget* tqparent ) + PMObject* & obj, TQWidget* parent ) { PMObject* last = link; PMObject* scene; @@ -119,7 +119,7 @@ int PMObjectSelect::selectObject( PMObject* link, const TQString& t, do { - scene = last->tqparent( ); + scene = last->parent( ); if( scene ) { if( scene->type( ) == "Scene" ) @@ -129,7 +129,7 @@ int PMObjectSelect::selectObject( PMObject* link, const TQString& t, found = true; } else - last = last->tqparent( ); + last = last->parent( ); } else stop = true; @@ -138,7 +138,7 @@ int PMObjectSelect::selectObject( PMObject* link, const TQString& t, if( found ) { - PMObjectSelect s( tqparent ); + PMObjectSelect s( parent ); PMObject* o = scene->firstChild( ); bool l = false; @@ -167,7 +167,7 @@ int PMObjectSelect::selectObject( PMObject* link, const TQString& t, int PMObjectSelect::selectObject( PMObject* link, const TQStringList& t, - PMObject* & obj, TQWidget* tqparent ) + PMObject* & obj, TQWidget* parent ) { PMObject* last = link; PMObject* scene; @@ -176,7 +176,7 @@ int PMObjectSelect::selectObject( PMObject* link, do { - scene = last->tqparent( ); + scene = last->parent( ); if( scene ) { if( scene->type( ) == "Scene" ) @@ -186,7 +186,7 @@ int PMObjectSelect::selectObject( PMObject* link, found = true; } else - last = last->tqparent( ); + last = last->parent( ); } else stop = true; @@ -195,7 +195,7 @@ int PMObjectSelect::selectObject( PMObject* link, if( found ) { - PMObjectSelect s( tqparent ); + PMObjectSelect s( parent ); PMObject* o = scene->firstChild( ); bool l = false; @@ -223,7 +223,7 @@ int PMObjectSelect::selectObject( PMObject* link, } int PMObjectSelect::selectDeclare( PMObject* link, const TQString& declareType, - PMObject* & obj, TQWidget* tqparent ) + PMObject* & obj, TQWidget* parent ) { PMObject* last = link; PMObject* scene; @@ -232,7 +232,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQString& declareType, do { - scene = last->tqparent( ); + scene = last->parent( ); if( scene ) { if( scene->type( ) == "Scene" ) @@ -242,7 +242,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQString& declareType, found = true; } else - last = last->tqparent( ); + last = last->parent( ); } else stop = true; @@ -251,7 +251,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQString& declareType, if( found ) { - PMObjectSelect s( tqparent ); + PMObjectSelect s( parent ); PMObject* o = scene->firstChild( ); PMDeclare* decl; @@ -285,7 +285,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQString& declareType, } int PMObjectSelect::selectDeclare( PMObject* link, const TQStringList& declareTypes, - PMObject* & obj, TQWidget* tqparent ) + PMObject* & obj, TQWidget* parent ) { PMObject* last = link; PMObject* scene; @@ -294,7 +294,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQStringList& declareTy do { - scene = last->tqparent( ); + scene = last->parent( ); if( scene ) { if( scene->type( ) == "Scene" ) @@ -304,7 +304,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQStringList& declareTy found = true; } else - last = last->tqparent( ); + last = last->parent( ); } else stop = true; @@ -313,7 +313,7 @@ int PMObjectSelect::selectDeclare( PMObject* link, const TQStringList& declareTy if( found ) { - PMObjectSelect s( tqparent ); + PMObjectSelect s( parent ); PMObject* o = scene->firstChild( ); PMDeclare* decl; diff --git a/kpovmodeler/pmobjectselect.h b/kpovmodeler/pmobjectselect.h index c8604eb4..8ef83583 100644 --- a/kpovmodeler/pmobjectselect.h +++ b/kpovmodeler/pmobjectselect.h @@ -87,9 +87,9 @@ class PMObjectSelect : public KDialogBase TQ_OBJECT public: /** - * Creates a selection widget with tqparent and name + * Creates a selection widget with parent and name */ - PMObjectSelect( TQWidget* tqparent = 0, const char* name = 0, + PMObjectSelect( TQWidget* parent = 0, const char* name = 0, bool modal = true ); /** * Deletes the dialog @@ -113,13 +113,13 @@ public: * Only objects above the object link are listed. */ static int selectObject( PMObject* link, const TQString& t, PMObject* & obj, - TQWidget* tqparent = 0 ); + TQWidget* parent = 0 ); static int selectObject( PMObject* link, const TQStringList& t, - PMObject* & obj, TQWidget* tqparent = 0 ); + PMObject* & obj, TQWidget* parent = 0 ); static int selectDeclare( PMObject* link, const TQString& declareType, - PMObject* & obj, TQWidget* tqparent = 0 ); + PMObject* & obj, TQWidget* parent = 0 ); static int selectDeclare( PMObject* link, const TQStringList& dt, - PMObject* & obj, TQWidget* tqparent = 0 ); + PMObject* & obj, TQWidget* parent = 0 ); protected slots: void slotHighlighted( TQListBoxItem* lbi ); diff --git a/kpovmodeler/pmobjectsettings.cpp b/kpovmodeler/pmobjectsettings.cpp index b02efbb8..77e7f0f5 100644 --- a/kpovmodeler/pmobjectsettings.cpp +++ b/kpovmodeler/pmobjectsettings.cpp @@ -44,8 +44,8 @@ #include <klocale.h> -PMObjectSettings::PMObjectSettings( TQWidget* tqparent, const char* name ) - : PMSettingsDialogPage( tqparent, name ) +PMObjectSettings::PMObjectSettings( TQWidget* parent, const char* name ) + : PMSettingsDialogPage( parent, name ) { TQHBoxLayout* htqlayout; TQVBoxLayout* vtqlayout; diff --git a/kpovmodeler/pmobjectsettings.h b/kpovmodeler/pmobjectsettings.h index 216b2c2f..1fcbc95e 100644 --- a/kpovmodeler/pmobjectsettings.h +++ b/kpovmodeler/pmobjectsettings.h @@ -39,7 +39,7 @@ public: /** * Default constructor */ - PMObjectSettings( TQWidget* tqparent, const char* name = 0 ); + PMObjectSettings( TQWidget* parent, const char* name = 0 ); /** */ virtual void displaySettings( ); /** */ diff --git a/kpovmodeler/pmopenglsettings.cpp b/kpovmodeler/pmopenglsettings.cpp index 0b76abdc..07376933 100644 --- a/kpovmodeler/pmopenglsettings.cpp +++ b/kpovmodeler/pmopenglsettings.cpp @@ -25,8 +25,8 @@ #include <tqlabel.h> #include <klocale.h> -PMOpenGLSettings::PMOpenGLSettings( TQWidget* tqparent, const char* name ) - : PMSettingsDialogPage( tqparent, name ) +PMOpenGLSettings::PMOpenGLSettings( TQWidget* parent, const char* name ) + : PMSettingsDialogPage( parent, name ) { TQVBoxLayout* vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); diff --git a/kpovmodeler/pmopenglsettings.h b/kpovmodeler/pmopenglsettings.h index 265cc056..5f05edcd 100644 --- a/kpovmodeler/pmopenglsettings.h +++ b/kpovmodeler/pmopenglsettings.h @@ -37,7 +37,7 @@ public: /** * Default constructor */ - PMOpenGLSettings( TQWidget* tqparent, const char* name = 0 ); + PMOpenGLSettings( TQWidget* parent, const char* name = 0 ); /** */ virtual void displaySettings( ); /** */ diff --git a/kpovmodeler/pmpalettevalueedit.cpp b/kpovmodeler/pmpalettevalueedit.cpp index b81caa78..25e1ac64 100644 --- a/kpovmodeler/pmpalettevalueedit.cpp +++ b/kpovmodeler/pmpalettevalueedit.cpp @@ -35,8 +35,8 @@ #include <kdialog.h> #include <kfiledialog.h> -PMPaletteValueEdit::PMPaletteValueEdit( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +PMPaletteValueEdit::PMPaletteValueEdit( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { TQLabel* lbl; TQHBoxLayout* tqlayout; diff --git a/kpovmodeler/pmpalettevalueedit.h b/kpovmodeler/pmpalettevalueedit.h index 86e7cc0c..a0ea00dc 100644 --- a/kpovmodeler/pmpalettevalueedit.h +++ b/kpovmodeler/pmpalettevalueedit.h @@ -38,7 +38,7 @@ class PMPaletteValueEdit: public TQWidget TQ_OBJECT public: /** */ - PMPaletteValueEdit( TQWidget* tqparent, const char* name = 0 ); + PMPaletteValueEdit( TQWidget* parent, const char* name = 0 ); /** */ void setIndex( int idx ); /** */ diff --git a/kpovmodeler/pmparser.cpp b/kpovmodeler/pmparser.cpp index 99398ce7..52a64acc 100644 --- a/kpovmodeler/pmparser.cpp +++ b/kpovmodeler/pmparser.cpp @@ -177,18 +177,18 @@ int PMParser::errorFlags( ) const } -void PMParser::parse( PMObjectList* list, PMObject* tqparent, +void PMParser::parse( PMObjectList* list, PMObject* parent, PMObject* after ) { m_pResultList = list; - m_pTopParent = tqparent; + m_pTopParent = parent; m_pAfter = after; // find first item, that can be a declare and can be used as link // for parsed objects. - if( tqparent ) + if( parent ) { - if( tqparent->type( ) == "Scene" ) + if( parent->type( ) == "Scene" ) { if( after ) m_pNextCheckDeclare = after; @@ -197,19 +197,19 @@ void PMParser::parse( PMObjectList* list, PMObject* tqparent, } else { - PMObject* obj = tqparent; + PMObject* obj = parent; bool stop = false; - // go to parents, until the tqparent is the scene + // go to parents, until the parent is the scene // (declares can only be inserted as top level objects) do { - if( obj->tqparent( ) ) + if( obj->parent( ) ) { - if( obj->tqparent( )->type( ) == "Scene" ) + if( obj->parent( )->type( ) == "Scene" ) stop = true; else - obj = obj->tqparent( ); + obj = obj->parent( ); } else { @@ -219,7 +219,7 @@ void PMParser::parse( PMObjectList* list, PMObject* tqparent, } while( obj && !stop ); - // now obj is the top level tqparent of the object, where parsed objects + // now obj is the top level parent of the object, where parsed objects // will be inserted if( obj ) m_pNextCheckDeclare = obj->prevSibling( ); @@ -240,22 +240,22 @@ void PMParser::parse( PMObjectList* list, PMObject* tqparent, setFatalError( ); } -bool PMParser::insertChild( PMObject* child, PMObject* tqparent ) +bool PMParser::insertChild( PMObject* child, PMObject* parent ) { bool inserted = false; - if( tqparent ) + if( parent ) { - if( tqparent->canInsert( child, tqparent->lastChild( ) ) ) + if( parent->canInsert( child, parent->lastChild( ) ) ) { - tqparent->appendChild( child ); + parent->appendChild( child ); inserted = true; } else { printError( i18n( "Can't insert %1 into %2." ) .tqarg( child->description( ) ) - .tqarg( tqparent->description( ) ) ); + .tqarg( parent->description( ) ) ); } } else diff --git a/kpovmodeler/pmparser.h b/kpovmodeler/pmparser.h index 3c48bb49..07a28ab6 100644 --- a/kpovmodeler/pmparser.h +++ b/kpovmodeler/pmparser.h @@ -81,13 +81,13 @@ public: * * Appends all parsed objects to the list. * - * tqparent is the object where the parsed objects will be inserted as + * parent is the object where the parsed objects will be inserted as * tqchildren behind the object after. These parameters are used to check * the consistency of declares and links. * - * Set tqparent and after to 0 if and only if a document is parsed/opened. + * Set parent and after to 0 if and only if a document is parsed/opened. */ - void parse( PMObjectList* list, PMObject* tqparent, + void parse( PMObjectList* list, PMObject* parent, PMObject* after ); /** @@ -196,12 +196,12 @@ public: */ PMSymbol* getSymbol( const TQString& id ) const; /** - * Tries to insert obj as child of tqparent. If tqparent is 0, the object + * Tries to insert obj as child of parent. If parent is 0, the object * will be inserted in the list of top level objects. * * Returns true if the object could be inserted. */ - bool insertChild( PMObject* obj, PMObject* tqparent ); + bool insertChild( PMObject* obj, PMObject* parent ); protected: /** @@ -217,7 +217,7 @@ protected: */ PMPart* m_pPart; /** - * tqparent object where the parsed top level objects + * parent object where the parsed top level objects * will be inserted _later_ (not from the parser) as tqchildren */ const PMObject* m_pTopParent; diff --git a/kpovmodeler/pmpart.cpp b/kpovmodeler/pmpart.cpp index 01b36deb..b9105b29 100644 --- a/kpovmodeler/pmpart.cpp +++ b/kpovmodeler/pmpart.cpp @@ -100,10 +100,10 @@ TQTime PMDebugTime; //#define KPM_WITH_OBJECT_LIBRARY PMPart::PMPart( TQWidget* parentWidget, const char* widgetName, - TQObject* tqparent, const char* name, bool readwrite, + TQObject* parent, const char* name, bool readwrite, PMShell* shell ) : DCOPObject( "PMPartIface" ), - KParts::ReadWritePart( tqparent, name ), + KParts::ReadWritePart( parent, name ), m_commandManager( this ) { setPluginLoadingMode( LoadPlugins ); @@ -162,10 +162,10 @@ PMPart::PMPart( TQWidget* parentWidget, const char* widgetName, } PMPart::PMPart( TQWidget* /*parentWidget*/, const char* /*widgetName*/, - TQObject* tqparent, const char* name, bool readwrite, + TQObject* parent, const char* name, bool readwrite, bool /*onlyCutPaste*/, PMShell* shell ) : DCOPObject( "LibraryBrowserIface" ), - KParts::ReadWritePart( tqparent, name ), + KParts::ReadWritePart( parent, name ), m_commandManager( this ) { setPluginLoadingMode( LoadPlugins ); @@ -662,8 +662,8 @@ void PMPart::updateNewObjectActions( ) bool readWriteParent = false; if( m_pActiveObject ) - if( m_pActiveObject->tqparent( ) ) - if( !m_pActiveObject->tqparent( )->isReadOnly( ) ) + if( m_pActiveObject->parent( ) ) + if( !m_pActiveObject->parent( )->isReadOnly( ) ) readWriteParent = true; for( ; it.current( ); ++it ) @@ -685,7 +685,7 @@ void PMPart::updateNewObjectActions( ) enable = m_pActiveObject->canInsert( insertName, m_pActiveObject->lastChild( ) ); if( !enable ) if( readWriteParent ) - enable |= m_pActiveObject->tqparent( )->canInsert( insertName, m_pActiveObject ); + enable |= m_pActiveObject->parent( )->canInsert( insertName, m_pActiveObject ); } else enable = false; @@ -701,7 +701,7 @@ void PMPart::updateNewObjectActions( ) enable = m_pActiveObject->canInsert( TQString( "CSG" ), m_pActiveObject->lastChild( ) ); if( !enable ) if( readWriteParent ) - enable = m_pActiveObject->tqparent( )->canInsert( TQString( "CSG" ), m_pActiveObject ); + enable = m_pActiveObject->parent( )->canInsert( TQString( "CSG" ), m_pActiveObject ); } else enable = false; @@ -725,13 +725,13 @@ void PMPart::initDocument( ) newDocument( ); } -void PMPart::initView( TQWidget* tqparent, const char* name ) +void PMPart::initView( TQWidget* parent, const char* name ) { if( !m_pShell ) { // a part inside konqueror // simple tqlayout - m_pView = new PMView( this, tqparent, name ); + m_pView = new PMView( this, parent, name ); m_pView->show( ); setWidget( m_pView ); } @@ -995,7 +995,7 @@ TQString PMPart::activeObjectName( ) result = tmpObj->type( ) + "/" + result; // go up in the scene - tmpObj = tmpObj->tqparent( ); + tmpObj = tmpObj->parent( ); idx = 0; } @@ -1240,9 +1240,9 @@ int PMPart::whereToInsert( PMObject* obj, const PMObjectList& list ) } } - if( obj->tqparent( ) ) + if( obj->parent( ) ) { - PMObject* p = obj->tqparent( ); + PMObject* p = obj->parent( ); if( !p->isReadOnly( ) ) { canInsertAsSibling = p->canInsert( list, obj ); @@ -1301,9 +1301,9 @@ int PMPart::whereToInsert( PMObject* obj, const TQStringList& list ) } } - if( obj->tqparent( ) ) + if( obj->parent( ) ) { - PMObject* p = obj->tqparent( ); + PMObject* p = obj->parent( ); if( !p->isReadOnly( ) ) { canInsertAsSibling = p->canInsert( list, obj ); @@ -1336,7 +1336,7 @@ int PMPart::whereToInsert( PMObject* obj ) int insertAs = 0; int insertPossibilities = 0; - if( obj->tqparent( ) ) + if( obj->parent( ) ) { insertAs |= PMInsertPopup::PMISibling; insertPossibilities++; @@ -1513,7 +1513,7 @@ bool PMPart::dragMoveSelectionTo( PMObject* obj ) command = new PMMoveCommand( sortedList, obj, hlp ); break; case PMInsertPopup::PMISibling: - command = new PMMoveCommand( sortedList, obj->tqparent( ), obj ); + command = new PMMoveCommand( sortedList, obj->parent( ), obj ); break; } } @@ -1600,30 +1600,30 @@ bool PMPart::insertFromParser( const TQString& type, PMParser* parser, if( success && insertAs ) { - PMObject* tqparent = 0; + PMObject* parent = 0; PMObject* after = 0; switch( insertAs ) { case PMInsertPopup::PMIFirstChild: - tqparent = obj; + parent = obj; after = 0; break; case PMInsertPopup::PMILastChild: - tqparent = obj; + parent = obj; after = obj->lastChild( ); break; case PMInsertPopup::PMISibling: - tqparent = obj->tqparent( ); + parent = obj->parent( ); after = obj; break; default: - tqparent = obj; + parent = obj; after = 0; break; } - parser->parse( &list, tqparent, after ); + parser->parse( &list, parent, after ); success = !( parser->warnings( ) || parser->errors( ) ); if( !success ) @@ -1639,7 +1639,7 @@ bool PMPart::insertFromParser( const TQString& type, PMParser* parser, if( success ) { // parsing was successful - command = new PMAddCommand( list, tqparent, after ); + command = new PMAddCommand( list, parent, after ); command->setText( type ); success = executeCommand( command ); @@ -1850,8 +1850,8 @@ void PMPart::slotObjectChanged( PMObject* obj, const int m, if( mode & PMCRemove ) { - if( obj->tqparent( ) ) - if( obj->tqparent( ) == m_pActiveObject ) + if( obj->parent( ) ) + if( obj->parent( ) == m_pActiveObject ) m_updateNewObjectActions = true; if( m_pNewSelection == obj ) { @@ -1859,8 +1859,8 @@ void PMPart::slotObjectChanged( PMObject* obj, const int m, m_pNewSelection = obj->nextSibling( ); else if( obj->prevSibling( ) ) m_pNewSelection = obj->nextSibling( ); - else if( obj->tqparent( ) ) - m_pNewSelection = obj->tqparent( ); + else if( obj->parent( ) ) + m_pNewSelection = obj->parent( ); else m_pNewSelection = 0; } @@ -1873,8 +1873,8 @@ void PMPart::slotObjectChanged( PMObject* obj, const int m, m_pNewSelection = obj->nextSibling( ); else if( obj->prevSibling( ) ) m_pNewSelection = obj->prevSibling( ); - else if( obj->tqparent( ) ) - m_pNewSelection = obj->tqparent( ); + else if( obj->parent( ) ) + m_pNewSelection = obj->parent( ); else m_pNewSelection = 0; } @@ -1911,8 +1911,8 @@ void PMPart::slotObjectChanged( PMObject* obj, const int m, if( obj->type( ) == "Camera" ) m_bCameraListUpToDate = false; } - if( obj->tqparent( ) ) - if( obj->tqparent( ) == m_pActiveObject ) + if( obj->parent( ) ) + if( obj->parent( ) == m_pActiveObject ) m_updateNewObjectActions = true; m_numAddedObjects++; } @@ -2028,7 +2028,7 @@ void PMPart::slotNewObject( PMObject* newObject, int insertAs ) break; case PMInsertPopup::PMISibling: command = new PMAddCommand( list, - m_pActiveObject->tqparent( ), + m_pActiveObject->parent( ), m_pActiveObject ); break; default: @@ -2525,8 +2525,8 @@ void PMPart::clearSelection( ) m_pNewSelection = it.current( )->nextSibling( ); else if( it.current( )->prevSibling( ) ) m_pNewSelection = it.current( )->prevSibling( ); - else if( it.current( )->tqparent( ) ) - m_pNewSelection = it.current( )->tqparent( ); + else if( it.current( )->parent( ) ) + m_pNewSelection = it.current( )->parent( ); for( ; it.current( ); ++it ) { @@ -2537,8 +2537,8 @@ void PMPart::clearSelection( ) m_pNewSelection = it.current( )->nextSibling( ); else if( it.current( )->prevSibling( ) ) m_pNewSelection = it.current( )->prevSibling( ); - else if( it.current( )->tqparent( ) ) - m_pNewSelection = it.current( )->tqparent( ); + else if( it.current( )->parent( ) ) + m_pNewSelection = it.current( )->parent( ); } } } diff --git a/kpovmodeler/pmpart.h b/kpovmodeler/pmpart.h index 30a60d41..d5a507b4 100644 --- a/kpovmodeler/pmpart.h +++ b/kpovmodeler/pmpart.h @@ -77,7 +77,7 @@ public: * application. */ PMPart( TQWidget* parentWidget, const char* widgetName, - TQObject* tqparent, const char* name, bool readWrite, + TQObject* parent, const char* name, bool readWrite, PMShell* shell = 0 ); /** @@ -85,7 +85,7 @@ public: * application. It does not create the main widget. */ PMPart( TQWidget* parentWidget, const char* widgetName, - TQObject* tqparent, const char* name, bool readWrite, + TQObject* parent, const char* name, bool readWrite, bool onlyCutPaste, PMShell* shell = 0 ); /** @@ -771,7 +771,7 @@ protected: * creates the widget of the part instance and sets * it as the view */ - void initView( TQWidget* tqparent, const char* name ); + void initView( TQWidget* parent, const char* name ); /** * initializes the documents contents */ @@ -1029,8 +1029,8 @@ class PMBrowserExtension : public KParts::BrowserExtension TQ_OBJECT friend class PMPart; public: - PMBrowserExtension( PMPart* tqparent ) - : KParts::BrowserExtension( tqparent, "PMBrowserExtension" ) + PMBrowserExtension( PMPart* parent ) + : KParts::BrowserExtension( parent, "PMBrowserExtension" ) { KGlobal::locale()->insertCatalogue("kpovmodeler"); } diff --git a/kpovmodeler/pmpattern.cpp b/kpovmodeler/pmpattern.cpp index bafbedda..95a975fc 100644 --- a/kpovmodeler/pmpattern.cpp +++ b/kpovmodeler/pmpattern.cpp @@ -982,9 +982,9 @@ void PMPattern::setDepth( const double c ) } } -PMDialogEditBase* PMPattern::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMPattern::editWidget( TQWidget* parent ) const { - return new PMPatternEdit( tqparent ); + return new PMPatternEdit( parent ); } void PMPattern::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmpattern.h b/kpovmodeler/pmpattern.h index 8b742280..ff184e15 100644 --- a/kpovmodeler/pmpattern.h +++ b/kpovmodeler/pmpattern.h @@ -88,7 +88,7 @@ public: /** * Returns a new @ref PMPatternEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** * Gets the pattern type diff --git a/kpovmodeler/pmpatternedit.cpp b/kpovmodeler/pmpatternedit.cpp index 87f5c987..c8d815a8 100644 --- a/kpovmodeler/pmpatternedit.cpp +++ b/kpovmodeler/pmpatternedit.cpp @@ -38,8 +38,8 @@ #include <kfiledialog.h> #include <kiconloader.h> -PMPatternEdit::PMPatternEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMPatternEdit::PMPatternEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } @@ -510,7 +510,7 @@ void PMPatternEdit::displayObject( PMObject* o ) m_pLambdaEdit->setValue( m_pDisplayedObject->lambda( ) ); m_pLambdaEdit->setReadOnly( readOnly ); - if( o->tqparent( ) && ( o->tqparent( )->type( ) == "Normal" ) ) + if( o->parent( ) && ( o->parent( )->type( ) == "Normal" ) ) { m_pDepthEdit->setValue( m_pDisplayedObject->depth( ) ); m_pDepthEdit->setReadOnly( readOnly ); @@ -685,8 +685,8 @@ void PMPatternEdit::saveContents( ) m_pDisplayedObject->setOmega( m_pOmegaEdit->value( ) ); m_pDisplayedObject->setLambda( m_pLambdaEdit->value( ) ); - if( m_pDisplayedObject->tqparent( ) && - ( m_pDisplayedObject->tqparent( )->type( ) == "Normal" ) ) + if( m_pDisplayedObject->parent( ) && + ( m_pDisplayedObject->parent( )->type( ) == "Normal" ) ) m_pDisplayedObject->setDepth( m_pDepthEdit->value( ) ); } } @@ -740,8 +740,8 @@ bool PMPatternEdit::isDataValid( ) if( !m_pOmegaEdit->isDataValid( ) ) return false; if( !m_pLambdaEdit->isDataValid( ) ) return false; } - if( m_pDisplayedObject->tqparent( ) && - m_pDisplayedObject->tqparent( )->type( ) == "Normal" && + if( m_pDisplayedObject->parent( ) && + m_pDisplayedObject->parent( )->type( ) == "Normal" && !m_pDepthEdit->isDataValid( ) ) return false; diff --git a/kpovmodeler/pmpatternedit.h b/kpovmodeler/pmpatternedit.h index fea9f140..18c250db 100644 --- a/kpovmodeler/pmpatternedit.h +++ b/kpovmodeler/pmpatternedit.h @@ -49,9 +49,9 @@ class PMPatternEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMPatternEdit with tqparent and name + * Creates a PMPatternEdit with parent and name */ - PMPatternEdit( TQWidget* tqparent, const char* name = 0 ); + PMPatternEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmphotons.cpp b/kpovmodeler/pmphotons.cpp index 129fc28f..8a904f86 100644 --- a/kpovmodeler/pmphotons.cpp +++ b/kpovmodeler/pmphotons.cpp @@ -192,9 +192,9 @@ void PMPhotons::setAreaLight( bool al ) } } -PMDialogEditBase* PMPhotons::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMPhotons::editWidget( TQWidget* parent ) const { - return new PMPhotonsEdit( tqparent ); + return new PMPhotonsEdit( parent ); } void PMPhotons::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmphotons.h b/kpovmodeler/pmphotons.h index 6fa8ad3c..34ecf25a 100644 --- a/kpovmodeler/pmphotons.h +++ b/kpovmodeler/pmphotons.h @@ -65,7 +65,7 @@ public: /** * Returns a new @ref PMPhotonsEdit */ - 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/pmphotonsedit.cpp b/kpovmodeler/pmphotonsedit.cpp index 0dbf8871..a2fde9a2 100644 --- a/kpovmodeler/pmphotonsedit.cpp +++ b/kpovmodeler/pmphotonsedit.cpp @@ -28,8 +28,8 @@ #include <kmessagebox.h> -PMPhotonsEdit::PMPhotonsEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMPhotonsEdit::PMPhotonsEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } @@ -84,7 +84,7 @@ void PMPhotonsEdit::displayObject( PMObject* o ) bool readOnly = o->isReadOnly( ); m_pDisplayedObject = ( PMPhotons* ) o; - if ( o->tqparent( ) && ( o->tqparent( )->isA( "Light" ) ) ) + if ( o->parent( ) && ( o->parent( )->isA( "Light" ) ) ) { m_pLayoutWidget->hide( ); m_pCollect->hide( ); diff --git a/kpovmodeler/pmphotonsedit.h b/kpovmodeler/pmphotonsedit.h index c5950eb1..3f6d5971 100644 --- a/kpovmodeler/pmphotonsedit.h +++ b/kpovmodeler/pmphotonsedit.h @@ -41,9 +41,9 @@ class PMPhotonsEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMPhotonsEdit with tqparent and name + * Creates a PMPhotonsEdit with parent and name */ - PMPhotonsEdit( TQWidget* tqparent, const char* name = 0 ); + PMPhotonsEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmpigment.cpp b/kpovmodeler/pmpigment.cpp index 697ac24f..d6f611b3 100644 --- a/kpovmodeler/pmpigment.cpp +++ b/kpovmodeler/pmpigment.cpp @@ -72,9 +72,9 @@ TQString PMPigment::description( ) const return i18n( "pigment" ); } -PMDialogEditBase* PMPigment::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMPigment::editWidget( TQWidget* parent ) const { - return new PMPigmentEdit( tqparent ); + return new PMPigmentEdit( parent ); } void PMPigment::serialize( TQDomElement& e, TQDomDocument& doc ) const diff --git a/kpovmodeler/pmpigment.h b/kpovmodeler/pmpigment.h index 4a1e6322..3f88d3ad 100644 --- a/kpovmodeler/pmpigment.h +++ b/kpovmodeler/pmpigment.h @@ -64,7 +64,7 @@ public: /** * Returns a new @ref PMPigmentEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmpigment" ); } diff --git a/kpovmodeler/pmpigmentedit.cpp b/kpovmodeler/pmpigmentedit.cpp index 761cb1bb..16bfab2c 100644 --- a/kpovmodeler/pmpigmentedit.cpp +++ b/kpovmodeler/pmpigmentedit.cpp @@ -25,8 +25,8 @@ #include <klocale.h> -PMPigmentEdit::PMPigmentEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMPigmentEdit::PMPigmentEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmpigmentedit.h b/kpovmodeler/pmpigmentedit.h index 578bdb46..82ca91e1 100644 --- a/kpovmodeler/pmpigmentedit.h +++ b/kpovmodeler/pmpigmentedit.h @@ -39,9 +39,9 @@ class PMPigmentEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMPigmentEdit with tqparent and name + * Creates a PMPigmentEdit with parent and name */ - PMPigmentEdit( TQWidget* tqparent, const char* name = 0 ); + PMPigmentEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmplane.cpp b/kpovmodeler/pmplane.cpp index 8c6dbf30..12574211 100644 --- a/kpovmodeler/pmplane.cpp +++ b/kpovmodeler/pmplane.cpp @@ -126,9 +126,9 @@ void PMPlane::setDistance( double distance ) } } -PMDialogEditBase* PMPlane::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMPlane::editWidget( TQWidget* parent ) const { - return new PMPlaneEdit( tqparent ); + return new PMPlaneEdit( parent ); } void PMPlane::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmplane.h b/kpovmodeler/pmplane.h index 32b25724..52fb9d4c 100644 --- a/kpovmodeler/pmplane.h +++ b/kpovmodeler/pmplane.h @@ -66,7 +66,7 @@ public: /** * Returns a new @ref PMPlaneEdit */ - 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/pmplaneedit.cpp b/kpovmodeler/pmplaneedit.cpp index 6f6306bf..5f90b008 100644 --- a/kpovmodeler/pmplaneedit.cpp +++ b/kpovmodeler/pmplaneedit.cpp @@ -28,8 +28,8 @@ #include <klocale.h> #include <kmessagebox.h> -PMPlaneEdit::PMPlaneEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMPlaneEdit::PMPlaneEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmplaneedit.h b/kpovmodeler/pmplaneedit.h index 0b4c3f3f..33d01e64 100644 --- a/kpovmodeler/pmplaneedit.h +++ b/kpovmodeler/pmplaneedit.h @@ -38,9 +38,9 @@ class PMPlaneEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMPlaneEdit with tqparent and name + * Creates a PMPlaneEdit with parent and name */ - PMPlaneEdit( TQWidget* tqparent, const char* name = 0 ); + PMPlaneEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmpluginsettings.cpp b/kpovmodeler/pmpluginsettings.cpp index 95f75e72..a788bc24 100644 --- a/kpovmodeler/pmpluginsettings.cpp +++ b/kpovmodeler/pmpluginsettings.cpp @@ -28,8 +28,8 @@ class PMPluginListViewItem : public TQListViewItem { public: - PMPluginListViewItem( TQListView* tqparent, PMPluginInfo* info ) - : TQListViewItem( tqparent, info->name( ), info->description( ) ) + PMPluginListViewItem( TQListView* parent, PMPluginInfo* info ) + : TQListViewItem( parent, info->name( ), info->description( ) ) { m_info = info; m_enabled = info->enabled( ); @@ -51,8 +51,8 @@ public: bool m_enabled; }; -PMPluginSettings::PMPluginSettings( TQWidget* tqparent, const char* name ) - : PMSettingsDialogPage( tqparent, name ) +PMPluginSettings::PMPluginSettings( TQWidget* parent, const char* name ) + : PMSettingsDialogPage( parent, name ) { TQVBoxLayout* vtqlayout = new TQVBoxLayout( this, 0, KDialog::spacingHint( ) ); diff --git a/kpovmodeler/pmpluginsettings.h b/kpovmodeler/pmpluginsettings.h index 42aa872d..f8cbb9a1 100644 --- a/kpovmodeler/pmpluginsettings.h +++ b/kpovmodeler/pmpluginsettings.h @@ -39,7 +39,7 @@ public: /** * Default constructor */ - PMPluginSettings( TQWidget* tqparent, const char* name = 0 ); + PMPluginSettings( TQWidget* parent, const char* name = 0 ); /** */ virtual void displaySettings( ); /** */ diff --git a/kpovmodeler/pmpolynom.cpp b/kpovmodeler/pmpolynom.cpp index a281e947..b9d75a13 100644 --- a/kpovmodeler/pmpolynom.cpp +++ b/kpovmodeler/pmpolynom.cpp @@ -158,9 +158,9 @@ void PMPolynom::cleanUp( ) const Base::cleanUp( ); } -PMDialogEditBase* PMPolynom::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMPolynom::editWidget( TQWidget* parent ) const { - return new PMPolynomEdit( tqparent ); + return new PMPolynomEdit( parent ); } void PMPolynom::setPolynomOrder( int o ) diff --git a/kpovmodeler/pmpolynom.h b/kpovmodeler/pmpolynom.h index cd0338f0..dc2e9c21 100644 --- a/kpovmodeler/pmpolynom.h +++ b/kpovmodeler/pmpolynom.h @@ -67,7 +67,7 @@ public: /** * Returns a new @ref PMPolynomEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual void restoreMemento( PMMemento* s ); diff --git a/kpovmodeler/pmpolynomedit.cpp b/kpovmodeler/pmpolynomedit.cpp index 7da978a1..ec3176d0 100644 --- a/kpovmodeler/pmpolynomedit.cpp +++ b/kpovmodeler/pmpolynomedit.cpp @@ -29,8 +29,8 @@ #include <klocale.h> #include <kdialog.h> -PMPolynomEdit::PMPolynomEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMPolynomEdit::PMPolynomEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; m_currentOrder = 0; diff --git a/kpovmodeler/pmpolynomedit.h b/kpovmodeler/pmpolynomedit.h index 2a1e5898..17ef6e11 100644 --- a/kpovmodeler/pmpolynomedit.h +++ b/kpovmodeler/pmpolynomedit.h @@ -43,9 +43,9 @@ class PMPolynomEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMPolynomEdit with tqparent and name + * Creates a PMPolynomEdit with parent and name */ - PMPolynomEdit( TQWidget* tqparent, const char* name = 0 ); + PMPolynomEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmpovray31serialization.cpp b/kpovmodeler/pmpovray31serialization.cpp index 9e057c56..543fec5b 100644 --- a/kpovmodeler/pmpovray31serialization.cpp +++ b/kpovmodeler/pmpovray31serialization.cpp @@ -410,8 +410,8 @@ void PMPov31SerDeclare( const PMObject* object, const PMMetaObject* tqmetaObject void PMPov31SerDensity( const PMObject* object, const PMMetaObject* tqmetaObject, PMOutputDevice* dev ) { bool bObject = true; - if( object->tqparent( ) ) - if( object->tqparent( )->type( ) == "DensityMap" ) + if( object->parent( ) ) + if( object->parent( )->type( ) == "DensityMap" ) bObject = false; if( bObject ) @@ -1260,8 +1260,8 @@ void PMPov31SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject, TQString str1; bool bObject = true; - if( o->tqparent( ) ) - if( o->tqparent( )->type( ) == "NormalMap" ) + if( o->parent( ) ) + if( o->parent( )->type( ) == "NormalMap" ) bObject = false; if( bObject ) @@ -1404,9 +1404,9 @@ void PMPov31SerPattern( const PMObject* object, const PMMetaObject*, PMOutputDev break; } // depth - if( o->tqparent( ) ) + if( o->parent( ) ) { - if( o->depth( ) && o->tqparent( )->type( ) == "Normal" ) + if( o->depth( ) && o->parent( )->type( ) == "Normal" ) { str.setNum( o->depth( ) ); dev->writeLine( str ); @@ -1458,8 +1458,8 @@ void PMPov31SerPigment( const PMObject* object, const PMMetaObject* tqmetaObject PMPigment* o = ( PMPigment* ) object; bool bObject = true; - if( o->tqparent( ) ) - if( o->tqparent( )->type( ) == "PigmentMap" ) + if( o->parent( ) ) + if( o->parent( )->type( ) == "PigmentMap" ) bObject = false; if( bObject ) @@ -1892,8 +1892,8 @@ void PMPov31SerTexture( const PMObject* object, const PMMetaObject* tqmetaObject PMTexture* o = ( PMTexture* ) object; bool bObject = true; - if( o->tqparent( ) ) - if( o->tqparent( )->type( ) == "TextureMap" ) + if( o->parent( ) ) + if( o->parent( )->type( ) == "TextureMap" ) bObject = false; if( bObject ) diff --git a/kpovmodeler/pmpovray35serialization.cpp b/kpovmodeler/pmpovray35serialization.cpp index d3f4ec95..a012c646 100644 --- a/kpovmodeler/pmpovray35serialization.cpp +++ b/kpovmodeler/pmpovray35serialization.cpp @@ -526,7 +526,7 @@ void PMPov35SerPhotons( const PMObject* object, const PMMetaObject*, PMOutputDev dev->objectBegin( "photons" ); - if( o->tqparent( ) && ( o->tqparent( )->type( ) == "Light" ) ) + if( o->parent( ) && ( o->parent( )->type( ) == "Light" ) ) { if( o->refraction( ) ) dev->writeLine( TQString( "refraction on" ) ); @@ -779,9 +779,9 @@ void PMPov35SerPattern( const PMObject* object, const PMMetaObject*, PMOutputDev break; } // depth - if( o->tqparent( ) ) + if( o->parent( ) ) { - if( o->depth( ) && o->tqparent( )->type( ) == "Normal" ) + if( o->depth( ) && o->parent( )->type( ) == "Normal" ) { str.setNum( o->depth( ) ); dev->writeLine( str ); @@ -894,9 +894,9 @@ void PMPov35SerNormal( const PMObject* object, const PMMetaObject* tqmetaObject, TQString str1; bool bObject = true; - if( o->tqparent( ) ) + if( o->parent( ) ) { - if( o->tqparent( )->type( ) == "NormalMap" ) + if( o->parent( )->type( ) == "NormalMap" ) bObject = false; } @@ -1356,8 +1356,8 @@ void PMPov35SerPigment( const PMObject* object, const PMMetaObject* tqmetaObject PMPigment* o = ( PMPigment* ) object; bool bObject = true; - if( o->tqparent( ) ) - if( o->tqparent( )->type( ) == "PigmentMap" ) + if( o->parent( ) ) + if( o->parent( )->type( ) == "PigmentMap" ) bObject = false; if( bObject ) @@ -1376,8 +1376,8 @@ void PMPov35SerTexture( const PMObject* object, const PMMetaObject* tqmetaObject PMTexture* o = ( PMTexture* ) object; bool bObject = true; - if( o->tqparent( ) ) - if( o->tqparent( )->type( ) == "TextureMap" ) + if( o->parent( ) ) + if( o->parent( )->type( ) == "TextureMap" ) bObject = false; if( bObject ) diff --git a/kpovmodeler/pmpovraymatrix.cpp b/kpovmodeler/pmpovraymatrix.cpp index 3a12f1eb..fd90ad92 100644 --- a/kpovmodeler/pmpovraymatrix.cpp +++ b/kpovmodeler/pmpovraymatrix.cpp @@ -108,9 +108,9 @@ void PMPovrayMatrix::setValues( const PMVector& v ) } } -PMDialogEditBase* PMPovrayMatrix::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMPovrayMatrix::editWidget( TQWidget* parent ) const { - return new PMPovrayMatrixEdit( tqparent ); + return new PMPovrayMatrixEdit( parent ); } void PMPovrayMatrix::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmpovraymatrix.h b/kpovmodeler/pmpovraymatrix.h index 4bdc2eee..d42e5f22 100644 --- a/kpovmodeler/pmpovraymatrix.h +++ b/kpovmodeler/pmpovraymatrix.h @@ -64,7 +64,7 @@ public: /** * Returns a new @ref PMPovrayMatrixEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmmatrix" ); } diff --git a/kpovmodeler/pmpovraymatrixedit.cpp b/kpovmodeler/pmpovraymatrixedit.cpp index 8bc4f9a5..1e0f7833 100644 --- a/kpovmodeler/pmpovraymatrixedit.cpp +++ b/kpovmodeler/pmpovraymatrixedit.cpp @@ -25,8 +25,8 @@ #include <klocale.h> -PMPovrayMatrixEdit::PMPovrayMatrixEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMPovrayMatrixEdit::PMPovrayMatrixEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmpovraymatrixedit.h b/kpovmodeler/pmpovraymatrixedit.h index 7b5a52ea..16c4ccac 100644 --- a/kpovmodeler/pmpovraymatrixedit.h +++ b/kpovmodeler/pmpovraymatrixedit.h @@ -39,9 +39,9 @@ class PMPovrayMatrixEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMPovrayMatrixEdit with tqparent and name + * Creates a PMPovrayMatrixEdit with parent and name */ - PMPovrayMatrixEdit( TQWidget* tqparent, const char* name = 0 ); + PMPovrayMatrixEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmpovrayoutputwidget.cpp b/kpovmodeler/pmpovrayoutputwidget.cpp index af56b62f..b2230272 100644 --- a/kpovmodeler/pmpovrayoutputwidget.cpp +++ b/kpovmodeler/pmpovrayoutputwidget.cpp @@ -30,8 +30,8 @@ TQSize PMPovrayOutputWidget::s_size = TQSize( 400, 400 ); -PMPovrayOutputWidget::PMPovrayOutputWidget( TQWidget* tqparent, const char* name ) - : KDialog( tqparent, name ) +PMPovrayOutputWidget::PMPovrayOutputWidget( TQWidget* parent, const char* name ) + : KDialog( parent, name ) { TQVBoxLayout* topLayout = new TQVBoxLayout( this, KDialog::marginHint( ), KDialog::spacingHint( ) ); diff --git a/kpovmodeler/pmpovrayoutputwidget.h b/kpovmodeler/pmpovrayoutputwidget.h index a5fbe883..f83ac9b1 100644 --- a/kpovmodeler/pmpovrayoutputwidget.h +++ b/kpovmodeler/pmpovrayoutputwidget.h @@ -39,7 +39,7 @@ public: /** * Standard constructor */ - PMPovrayOutputWidget( TQWidget* tqparent = 0, const char* name = 0 ); + PMPovrayOutputWidget( TQWidget* parent = 0, const char* name = 0 ); /** * Destructor */ diff --git a/kpovmodeler/pmpovrayparser.cpp b/kpovmodeler/pmpovrayparser.cpp index ad19c67f..c4fa41ce 100644 --- a/kpovmodeler/pmpovrayparser.cpp +++ b/kpovmodeler/pmpovrayparser.cpp @@ -191,7 +191,7 @@ bool PMPovrayParser::parseBool( ) return true; } -bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, +bool PMPovrayParser::parseChildObjects( PMCompositeObject* parent, int max /* = -1 */ ) { PMObject* child = 0; @@ -202,10 +202,10 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, do { - if( !m_bLastPMCommentEmpty && tqparent ) + if( !m_bLastPMCommentEmpty && parent ) { - if( tqparent->isA( "NamedObject" ) ) - ( ( PMNamedObject* ) tqparent )->setName( m_lastPMComment ); + if( parent->isA( "NamedObject" ) ) + ( ( PMNamedObject* ) parent )->setName( m_lastPMComment ); m_bLastPMCommentEmpty = true; } if( m_skippedComments.count( ) > 0 ) @@ -230,8 +230,8 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, error = !parseBox( ( PMBox* ) child ); break; case SPHERE_TOK: - if( ( tqparent && ( tqparent->type( ) == "Blob" ) ) - || ( !tqparent && m_pTopParent + if( ( parent && ( parent->type( ) == "Blob" ) ) + || ( !parent && m_pTopParent && ( m_pTopParent->type( ) == "Blob" ) ) ) { child = new PMBlobSphere( m_pPart ); @@ -244,8 +244,8 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, } break; case CYLINDER_TOK: - if( ( tqparent && ( tqparent->type( ) == "Blob" ) ) - || ( !tqparent && m_pTopParent + if( ( parent && ( parent->type( ) == "Blob" ) ) + || ( !parent && m_pTopParent && ( m_pTopParent->type( ) == "Blob" ) ) ) { child = new PMBlobCylinder( m_pPart ); @@ -378,14 +378,14 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, child = new PMPattern( m_pPart ); { bool normal = true; - if( tqparent && ( tqparent->type( ) != "Normal" ) ) + if( parent && ( parent->type( ) != "Normal" ) ) normal = false; error = !parsePattern( ( PMPattern* ) child, normal ); } break; case TURBULENCE_TOK: // Search for a PMPattern in the object's tqchildren - child = tqparent->firstChild( ); + child = parent->firstChild( ); while( child && !child->isA( "Pattern" ) ) child = child->nextSibling( ); if( child ) @@ -409,7 +409,7 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, case CUBIC_WAVE_TOK: case POLY_WAVE_TOK: // Search for a PMBlendMapModifiers in the object's tqchildren - child = tqparent->firstChild( ); + child = parent->firstChild( ); while( child && !child->isA( "BlendMapModifiers" ) ) child = child->nextSibling( ); if( child ) @@ -478,7 +478,7 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, int expect = 0; PMListPattern::PMListType type = PMListPattern::ListPatternChecker; - if( tqparent && tqparent->type( ) == "Normal" ) + if( parent && parent->type( ) == "Normal" ) normal = true; else if( m_pTopParent && m_pTopParent->type( ) == "Normal" ) normal = true; @@ -640,7 +640,7 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, error = !parseMatrix( ( PMPovrayMatrix* ) child ); break; case BOUNDED_BY_TOK: - if( tqparent && ( tqparent->type( ) == "ClippedBy" ) ) + if( parent && ( parent->type( ) == "ClippedBy" ) ) finished = true; else { @@ -649,7 +649,7 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, } break; case CLIPPED_BY_TOK: - if( tqparent && ( tqparent->type( ) == "BoundedBy" ) ) + if( parent && ( parent->type( ) == "BoundedBy" ) ) finished = true; else { @@ -666,7 +666,7 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, error = !parseRadiosity( ( PMRadiosity* ) child ); break; case PHOTONS_TOK: - if ( tqparent && ( tqparent->type( ) == "GlobalSettings" ) ) + if ( parent && ( parent->type( ) == "GlobalSettings" ) ) { child = new PMGlobalPhotons( m_pPart ); error = !parseGlobalPhotons( ( PMGlobalPhotons* ) child ); @@ -791,7 +791,7 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, printExpected( i18n( "identifier" ), m_pScanner->sValue( ) ); break; case OBJECT_TOK: - error = !parseObject( tqparent ); + error = !parseObject( parent ); noChild = true; break; case RAW_POVRAY_TOK: @@ -808,7 +808,7 @@ bool PMPovrayParser::parseChildObjects( PMCompositeObject* tqparent, error = true; if( child ) { - if( !insertChild( child, tqparent ) ) + if( !insertChild( child, parent ) ) { delete child; child = 0; @@ -6572,7 +6572,7 @@ bool PMPovrayParser::parseDeclare( PMDeclare* decl ) return !error; } -bool PMPovrayParser::parseObject( PMCompositeObject* tqparent ) +bool PMPovrayParser::parseObject( PMCompositeObject* parent ) { PMObject* child; bool error = false; @@ -6586,23 +6586,23 @@ bool PMPovrayParser::parseObject( PMCompositeObject* tqparent ) case ID_TOK: child = new PMObjectLink( m_pPart ); error = !parseObjectLink( ( PMObjectLink* ) child ); - if( !insertChild( child, tqparent ) ) + if( !insertChild( child, parent ) ) delete child; break; default: { PMObject* lastChild = 0; - if( tqparent ) - lastChild = tqparent->lastChild( ); + if( parent ) + lastChild = parent->lastChild( ); else lastChild = m_pResultList->last( ); - error = !parseChildObjects( tqparent, 1 ); + error = !parseChildObjects( parent, 1 ); if( !error ) { PMObject* newLast = 0; - if( tqparent ) - newLast = tqparent->lastChild( ); + if( parent ) + newLast = parent->lastChild( ); else newLast = m_pResultList->last( ); diff --git a/kpovmodeler/pmpovrayparser.h b/kpovmodeler/pmpovrayparser.h index c00bdfbe..9ad714d2 100644 --- a/kpovmodeler/pmpovrayparser.h +++ b/kpovmodeler/pmpovrayparser.h @@ -160,14 +160,14 @@ private: /** - * Looks for child objects, parses them and appends them to the tqparent - * object. If tqparent is 0, all objects are appended to the result list. + * Looks for child objects, parses them and appends them to the parent + * object. If parent is 0, all objects are appended to the result list. * * If max is > 0, then the maximum number of parsed objects is max. * * Returns true if there where no objects or parsing was successful. */ - bool parseChildObjects( PMCompositeObject* tqparent, int max = -1 ); + bool parseChildObjects( PMCompositeObject* parent, int max = -1 ); /** @@ -491,7 +491,7 @@ private: /** * Parse function for object keywords */ - bool parseObject( PMCompositeObject* tqparent ); + bool parseObject( PMCompositeObject* parent ); // POV-Ray 3.5 objects bool parseIsoSurface( PMIsoSurface* iso ); diff --git a/kpovmodeler/pmpovrayrenderwidget.cpp b/kpovmodeler/pmpovrayrenderwidget.cpp index fb3cbf67..aae9c137 100644 --- a/kpovmodeler/pmpovrayrenderwidget.cpp +++ b/kpovmodeler/pmpovrayrenderwidget.cpp @@ -40,8 +40,8 @@ TQString PMPovrayRenderWidget::s_povrayCommand = c_defaultPovrayCommand; TQStringList PMPovrayRenderWidget::s_libraryPaths; -PMPovrayRenderWidget::PMPovrayRenderWidget( TQWidget* tqparent, const char* name ) - : PMDragWidget( tqparent, name ) +PMPovrayRenderWidget::PMPovrayRenderWidget( TQWidget* parent, const char* name ) + : PMDragWidget( parent, name ) { m_pProcess = 0; m_bSuspended = false; diff --git a/kpovmodeler/pmpovrayrenderwidget.h b/kpovmodeler/pmpovrayrenderwidget.h index 1fbd891a..8f9d0533 100644 --- a/kpovmodeler/pmpovrayrenderwidget.h +++ b/kpovmodeler/pmpovrayrenderwidget.h @@ -48,7 +48,7 @@ public: /** * Standard constructor */ - PMPovrayRenderWidget( TQWidget* tqparent = 0, const char* name = 0 ); + PMPovrayRenderWidget( TQWidget* parent = 0, const char* name = 0 ); /** * destructor */ diff --git a/kpovmodeler/pmpovraysettings.cpp b/kpovmodeler/pmpovraysettings.cpp index 4f6b8474..eac93134 100644 --- a/kpovmodeler/pmpovraysettings.cpp +++ b/kpovmodeler/pmpovraysettings.cpp @@ -35,8 +35,8 @@ #include <kmessagebox.h> #include <kfiledialog.h> -PMPovraySettings::PMPovraySettings( TQWidget* tqparent, const char* name ) - : PMSettingsDialogPage( tqparent, name ) +PMPovraySettings::PMPovraySettings( TQWidget* parent, const char* name ) + : PMSettingsDialogPage( parent, name ) { m_selectionIndex = 0; diff --git a/kpovmodeler/pmpovraysettings.h b/kpovmodeler/pmpovraysettings.h index 5b267880..467b95c5 100644 --- a/kpovmodeler/pmpovraysettings.h +++ b/kpovmodeler/pmpovraysettings.h @@ -40,7 +40,7 @@ public: /** * Default constructor */ - PMPovraySettings( TQWidget* tqparent, const char* name = 0 ); + PMPovraySettings( TQWidget* parent, const char* name = 0 ); /** */ virtual void displaySettings( ); /** */ diff --git a/kpovmodeler/pmpovraywidget.cpp b/kpovmodeler/pmpovraywidget.cpp index c86eabe1..086ced61 100644 --- a/kpovmodeler/pmpovraywidget.cpp +++ b/kpovmodeler/pmpovraywidget.cpp @@ -40,8 +40,8 @@ const int timerIntervall = 1000; bool PMPovrayWidget::s_imageFormatsRegistered = false; -PMPovrayWidget::PMPovrayWidget( TQWidget* tqparent, const char* name ) - : KDialog( tqparent, name ) +PMPovrayWidget::PMPovrayWidget( TQWidget* parent, const char* name ) + : KDialog( parent, name ) { TQVBoxLayout* topLayout = new TQVBoxLayout( this, KDialog::marginHint( ), KDialog::spacingHint( ) ); topLayout->addStretch( ); diff --git a/kpovmodeler/pmpovraywidget.h b/kpovmodeler/pmpovraywidget.h index fe910a88..c21cdc7b 100644 --- a/kpovmodeler/pmpovraywidget.h +++ b/kpovmodeler/pmpovraywidget.h @@ -47,7 +47,7 @@ public: /** * Standard constructor */ - PMPovrayWidget( TQWidget* tqparent = 0, const char* name = 0 ); + PMPovrayWidget( TQWidget* parent = 0, const char* name = 0 ); /** * Destructor */ diff --git a/kpovmodeler/pmpreviewsettings.cpp b/kpovmodeler/pmpreviewsettings.cpp index 54afb0dd..a08ff1fe 100644 --- a/kpovmodeler/pmpreviewsettings.cpp +++ b/kpovmodeler/pmpreviewsettings.cpp @@ -29,8 +29,8 @@ #include <klocale.h> #include <kmessagebox.h> -PMPreviewSettings::PMPreviewSettings( TQWidget* tqparent, const char* name ) - : PMSettingsDialogPage( tqparent, name ) +PMPreviewSettings::PMPreviewSettings( TQWidget* parent, const char* name ) + : PMSettingsDialogPage( parent, name ) { TQHBoxLayout* htqlayout; TQVBoxLayout* vtqlayout; diff --git a/kpovmodeler/pmpreviewsettings.h b/kpovmodeler/pmpreviewsettings.h index 4818fb3b..4e4275f2 100644 --- a/kpovmodeler/pmpreviewsettings.h +++ b/kpovmodeler/pmpreviewsettings.h @@ -40,7 +40,7 @@ public: /** * Default constructor */ - PMPreviewSettings( TQWidget* tqparent, const char* name = 0 ); + PMPreviewSettings( TQWidget* parent, const char* name = 0 ); /** */ virtual void displaySettings( ); /** */ diff --git a/kpovmodeler/pmprism.cpp b/kpovmodeler/pmprism.cpp index a1beddca..a7c5c8f7 100644 --- a/kpovmodeler/pmprism.cpp +++ b/kpovmodeler/pmprism.cpp @@ -392,9 +392,9 @@ void PMPrism::setPoints( const TQValueList< TQValueList<PMVector> >& points ) } } -PMDialogEditBase* PMPrism::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMPrism::editWidget( TQWidget* parent ) const { - return new PMPrismEdit( tqparent ); + return new PMPrismEdit( parent ); } void PMPrism::createMemento( ) diff --git a/kpovmodeler/pmprism.h b/kpovmodeler/pmprism.h index 4b0196e6..facce467 100644 --- a/kpovmodeler/pmprism.h +++ b/kpovmodeler/pmprism.h @@ -78,7 +78,7 @@ public: /** * Returns a new @ref PMPrismEdit */ - 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/pmprismedit.cpp b/kpovmodeler/pmprismedit.cpp index 5ce7910d..78960007 100644 --- a/kpovmodeler/pmprismedit.cpp +++ b/kpovmodeler/pmprismedit.cpp @@ -34,8 +34,8 @@ #include <kiconloader.h> #include <kmessagebox.h> -PMPrismEdit::PMPrismEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMPrismEdit::PMPrismEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; m_lastSplineType = 0; diff --git a/kpovmodeler/pmprismedit.h b/kpovmodeler/pmprismedit.h index 6a9c03e5..2b9c2bd2 100644 --- a/kpovmodeler/pmprismedit.h +++ b/kpovmodeler/pmprismedit.h @@ -49,9 +49,9 @@ class PMPrismEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMPrismEdit with tqparent and name + * Creates a PMPrismEdit with parent and name */ - PMPrismEdit( TQWidget* tqparent, const char* name = 0 ); + PMPrismEdit( TQWidget* parent, const char* name = 0 ); /** * Destructor */ diff --git a/kpovmodeler/pmprojectedthrough.cpp b/kpovmodeler/pmprojectedthrough.cpp index 9458a19d..71710395 100644 --- a/kpovmodeler/pmprojectedthrough.cpp +++ b/kpovmodeler/pmprojectedthrough.cpp @@ -80,9 +80,9 @@ void PMProjectedThrough::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMDialogEditBase* PMProjectedThrough::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMProjectedThrough::editWidget( TQWidget* parent ) const { - return new PMNamedObjectEdit( tqparent ); + return new PMNamedObjectEdit( parent ); } void PMProjectedThrough::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmprojectedthrough.h b/kpovmodeler/pmprojectedthrough.h index e1dc200a..606aa972 100644 --- a/kpovmodeler/pmprojectedthrough.h +++ b/kpovmodeler/pmprojectedthrough.h @@ -64,7 +64,7 @@ public: /** * Returns a new @ref PMProjectedThroughEdit */ - 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/pmquickcolor.cpp b/kpovmodeler/pmquickcolor.cpp index ac025a62..d1bcf100 100644 --- a/kpovmodeler/pmquickcolor.cpp +++ b/kpovmodeler/pmquickcolor.cpp @@ -102,9 +102,9 @@ void PMQuickColor::setColor( const PMColor& c ) } } -PMDialogEditBase* PMQuickColor::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMQuickColor::editWidget( TQWidget* parent ) const { - return new PMQuickColorEdit( tqparent ); + return new PMQuickColorEdit( parent ); } void PMQuickColor::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmquickcolor.h b/kpovmodeler/pmquickcolor.h index 80f5ee4b..0fe9ccbe 100644 --- a/kpovmodeler/pmquickcolor.h +++ b/kpovmodeler/pmquickcolor.h @@ -69,7 +69,7 @@ public: /** * Returns a new @ref PMQuickColorEdit */ - 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/pmquickcoloredit.cpp b/kpovmodeler/pmquickcoloredit.cpp index 1a48c873..9e0a2d29 100644 --- a/kpovmodeler/pmquickcoloredit.cpp +++ b/kpovmodeler/pmquickcoloredit.cpp @@ -26,8 +26,8 @@ #include <klocale.h> -PMQuickColorEdit::PMQuickColorEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMQuickColorEdit::PMQuickColorEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmquickcoloredit.h b/kpovmodeler/pmquickcoloredit.h index 456b9660..f3e6d9df 100644 --- a/kpovmodeler/pmquickcoloredit.h +++ b/kpovmodeler/pmquickcoloredit.h @@ -41,9 +41,9 @@ class PMQuickColorEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMQuickColorEdit with tqparent and name + * Creates a PMQuickColorEdit with parent and name */ - PMQuickColorEdit( TQWidget* tqparent, const char* name = 0 ); + PMQuickColorEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmradiosity.cpp b/kpovmodeler/pmradiosity.cpp index 6f6a6811..39d61342 100644 --- a/kpovmodeler/pmradiosity.cpp +++ b/kpovmodeler/pmradiosity.cpp @@ -356,9 +356,9 @@ void PMRadiosity::setRecursionLimit( int c ) } } -PMDialogEditBase* PMRadiosity::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMRadiosity::editWidget( TQWidget* parent ) const { - return new PMRadiosityEdit( tqparent ); + return new PMRadiosityEdit( parent ); } void PMRadiosity::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmradiosity.h b/kpovmodeler/pmradiosity.h index 7eb34498..4a1c1ad1 100644 --- a/kpovmodeler/pmradiosity.h +++ b/kpovmodeler/pmradiosity.h @@ -65,7 +65,7 @@ public: /** * Returns a new @ref PMRadiosityEdit */ - 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/pmradiosityedit.cpp b/kpovmodeler/pmradiosityedit.cpp index 968227fb..97494ff8 100644 --- a/kpovmodeler/pmradiosityedit.cpp +++ b/kpovmodeler/pmradiosityedit.cpp @@ -28,8 +28,8 @@ #include <kmessagebox.h> -PMRadiosityEdit::PMRadiosityEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMRadiosityEdit::PMRadiosityEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmradiosityedit.h b/kpovmodeler/pmradiosityedit.h index ae4586ce..9a272869 100644 --- a/kpovmodeler/pmradiosityedit.h +++ b/kpovmodeler/pmradiosityedit.h @@ -41,9 +41,9 @@ class PMRadiosityEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMRadiosityEdit with tqparent and name + * Creates a PMRadiosityEdit with parent and name */ - PMRadiosityEdit( TQWidget* tqparent, const char* name = 0 ); + PMRadiosityEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmrainbow.cpp b/kpovmodeler/pmrainbow.cpp index fe5ea8f9..62def615 100644 --- a/kpovmodeler/pmrainbow.cpp +++ b/kpovmodeler/pmrainbow.cpp @@ -347,9 +347,9 @@ void PMRainbow::enableFalloffAngle( bool c ) } } -PMDialogEditBase* PMRainbow::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMRainbow::editWidget( TQWidget* parent ) const { - return new PMRainbowEdit( tqparent ); + return new PMRainbowEdit( parent ); } void PMRainbow::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmrainbow.h b/kpovmodeler/pmrainbow.h index b9c2915b..1b631ed1 100644 --- a/kpovmodeler/pmrainbow.h +++ b/kpovmodeler/pmrainbow.h @@ -64,7 +64,7 @@ public: /** * Returns a new @ref PMRainbowEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmrainbow" ); } diff --git a/kpovmodeler/pmrainbowedit.cpp b/kpovmodeler/pmrainbowedit.cpp index b2aa7cee..7765f720 100644 --- a/kpovmodeler/pmrainbowedit.cpp +++ b/kpovmodeler/pmrainbowedit.cpp @@ -30,8 +30,8 @@ #include <kmessagebox.h> -PMRainbowEdit::PMRainbowEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMRainbowEdit::PMRainbowEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmrainbowedit.h b/kpovmodeler/pmrainbowedit.h index e2c4698d..be91f895 100644 --- a/kpovmodeler/pmrainbowedit.h +++ b/kpovmodeler/pmrainbowedit.h @@ -42,9 +42,9 @@ class PMRainbowEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMRainbowEdit with tqparent and name + * Creates a PMRainbowEdit with parent and name */ - PMRainbowEdit( TQWidget* tqparent, const char* name = 0 ); + PMRainbowEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmraw.cpp b/kpovmodeler/pmraw.cpp index f1f2575b..4971433c 100644 --- a/kpovmodeler/pmraw.cpp +++ b/kpovmodeler/pmraw.cpp @@ -104,9 +104,9 @@ void PMRaw::readAttributes( const PMXMLHelper& h ) m_code = e.toText( ).data( ); } -PMDialogEditBase* PMRaw::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMRaw::editWidget( TQWidget* parent ) const { - return new PMRawEdit( tqparent ); + return new PMRawEdit( parent ); } void PMRaw::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmraw.h b/kpovmodeler/pmraw.h index 7d5673cb..541687c8 100644 --- a/kpovmodeler/pmraw.h +++ b/kpovmodeler/pmraw.h @@ -72,7 +72,7 @@ public: virtual void cleanUp( ) const; /** */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmraw" ); } /** */ diff --git a/kpovmodeler/pmrawedit.cpp b/kpovmodeler/pmrawedit.cpp index c43adadc..98cc5ec1 100644 --- a/kpovmodeler/pmrawedit.cpp +++ b/kpovmodeler/pmrawedit.cpp @@ -25,8 +25,8 @@ #include <kglobalsettings.h> #include <klocale.h> -PMRawEdit::PMRawEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMRawEdit::PMRawEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmrawedit.h b/kpovmodeler/pmrawedit.h index f3ba740d..620e6b09 100644 --- a/kpovmodeler/pmrawedit.h +++ b/kpovmodeler/pmrawedit.h @@ -39,9 +39,9 @@ class PMRawEdit : public PMNamedObjectEdit typedef PMNamedObjectEdit Base; public: /** - * Creates a PMRawEdit with tqparent and name + * Creates a PMRawEdit with parent and name */ - PMRawEdit( TQWidget* tqparent, const char* name = 0 ); + PMRawEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmrecursiveobjectiterator.cpp b/kpovmodeler/pmrecursiveobjectiterator.cpp index 423e0556..eeacfaa6 100644 --- a/kpovmodeler/pmrecursiveobjectiterator.cpp +++ b/kpovmodeler/pmrecursiveobjectiterator.cpp @@ -39,7 +39,7 @@ PMObject* PMRecursiveObjectIterator::operator++( ) bool stop = false; do { - m_pCurrent = m_pCurrent->tqparent( ); + m_pCurrent = m_pCurrent->parent( ); if( !m_pCurrent ) stop = true; else if( m_pCurrent == m_pObject ) diff --git a/kpovmodeler/pmrendermanager.cpp b/kpovmodeler/pmrendermanager.cpp index 5d6edbbb..6ba1fe99 100644 --- a/kpovmodeler/pmrendermanager.cpp +++ b/kpovmodeler/pmrendermanager.cpp @@ -416,8 +416,8 @@ void PMRenderManager::renderObject( PMObject* objectToRender ) m_selected = true; m_pDeselectObject = objectToRender; if( objectToRender->hasTransformationMatrix( ) ) - if( objectToRender->tqparent( ) ) - m_pDeselectObject = objectToRender->tqparent( ); + if( objectToRender->parent( ) ) + m_pDeselectObject = objectToRender->parent( ); } } diff --git a/kpovmodeler/pmrendermodesdialog.cpp b/kpovmodeler/pmrendermodesdialog.cpp index 55f969cf..4fa8f09f 100644 --- a/kpovmodeler/pmrendermodesdialog.cpp +++ b/kpovmodeler/pmrendermodesdialog.cpp @@ -37,8 +37,8 @@ TQSize PMRenderModesDialog::s_size = TQSize( 300, 200 ); -PMRenderModesDialog::PMRenderModesDialog( PMRenderModeList* modes, TQWidget* tqparent, const char* name ) - : KDialogBase( tqparent, name, true, i18n( "Render Modes" ), +PMRenderModesDialog::PMRenderModesDialog( PMRenderModeList* modes, TQWidget* parent, const char* name ) + : KDialogBase( parent, name, true, i18n( "Render Modes" ), Ok | Cancel, Ok ) { m_selectionIndex = modes->at( ); @@ -239,8 +239,8 @@ const char* qualityString[numQuality] = const int c_qualityToIndex[12] = { 0, 0, 1, 1, 2, 3, 4, 4, 5, 6, 7, 8 }; const int c_indexToQuality[numQuality] = { 0, 2, 4, 5, 6, 8, 9, 10, 11 }; -PMRenderModeDialog::PMRenderModeDialog( PMRenderMode* mode, TQWidget* tqparent, const char* name ) - : KDialogBase( tqparent, name, true, i18n( "Render Modes" ), +PMRenderModeDialog::PMRenderModeDialog( PMRenderMode* mode, TQWidget* parent, const char* name ) + : KDialogBase( parent, name, true, i18n( "Render Modes" ), Ok | Cancel, Ok ) { m_pMode = mode; diff --git a/kpovmodeler/pmrendermodesdialog.h b/kpovmodeler/pmrendermodesdialog.h index 1494095e..b2d800bb 100644 --- a/kpovmodeler/pmrendermodesdialog.h +++ b/kpovmodeler/pmrendermodesdialog.h @@ -44,7 +44,7 @@ public: /** * Creates a dialog for the modes list */ - PMRenderModesDialog( PMRenderModeList* modes, TQWidget* tqparent = 0, const char* name = 0 ); + PMRenderModesDialog( PMRenderModeList* modes, TQWidget* parent = 0, const char* name = 0 ); static void saveConfig( KConfig* cfg ); static void restoreConfig( KConfig* cfg ); @@ -113,7 +113,7 @@ public: /** * Creates a dialog for the mode */ - PMRenderModeDialog( PMRenderMode* mode, TQWidget* tqparent = 0, const char* name = 0 ); + PMRenderModeDialog( PMRenderMode* mode, TQWidget* parent = 0, const char* name = 0 ); static void saveConfig( KConfig* cfg ); static void restoreConfig( KConfig* cfg ); diff --git a/kpovmodeler/pmrotate.cpp b/kpovmodeler/pmrotate.cpp index 700c611c..feed0091 100644 --- a/kpovmodeler/pmrotate.cpp +++ b/kpovmodeler/pmrotate.cpp @@ -102,9 +102,9 @@ void PMRotate::setRotation( const PMVector& p ) } } -PMDialogEditBase* PMRotate::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMRotate::editWidget( TQWidget* parent ) const { - return new PMRotateEdit( tqparent ); + return new PMRotateEdit( parent ); } void PMRotate::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmrotate.h b/kpovmodeler/pmrotate.h index ad80f2b0..5090a933 100644 --- a/kpovmodeler/pmrotate.h +++ b/kpovmodeler/pmrotate.h @@ -66,7 +66,7 @@ public: /** * Returns a new @ref PMRotateEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmrotate" ); } diff --git a/kpovmodeler/pmrotateedit.cpp b/kpovmodeler/pmrotateedit.cpp index 6803b90c..2ad5f06e 100644 --- a/kpovmodeler/pmrotateedit.cpp +++ b/kpovmodeler/pmrotateedit.cpp @@ -24,8 +24,8 @@ #include <klocale.h> -PMRotateEdit::PMRotateEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMRotateEdit::PMRotateEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmrotateedit.h b/kpovmodeler/pmrotateedit.h index 147c4b1c..202af2b3 100644 --- a/kpovmodeler/pmrotateedit.h +++ b/kpovmodeler/pmrotateedit.h @@ -39,9 +39,9 @@ class PMRotateEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMRotateEdit with tqparent and name + * Creates a PMRotateEdit with parent and name */ - PMRotateEdit( TQWidget* tqparent, const char* name = 0 ); + PMRotateEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmscale.cpp b/kpovmodeler/pmscale.cpp index 9b78f7e3..5e1c4717 100644 --- a/kpovmodeler/pmscale.cpp +++ b/kpovmodeler/pmscale.cpp @@ -102,9 +102,9 @@ void PMScale::setScale( const PMVector& p ) } } -PMDialogEditBase* PMScale::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMScale::editWidget( TQWidget* parent ) const { - return new PMScaleEdit( tqparent ); + return new PMScaleEdit( parent ); } void PMScale::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmscale.h b/kpovmodeler/pmscale.h index b0b6a12d..55a40eaf 100644 --- a/kpovmodeler/pmscale.h +++ b/kpovmodeler/pmscale.h @@ -67,7 +67,7 @@ public: /** * Returns a new @ref PMScaleEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmscale" ); } diff --git a/kpovmodeler/pmscaleedit.cpp b/kpovmodeler/pmscaleedit.cpp index 9b96c496..24f3a471 100644 --- a/kpovmodeler/pmscaleedit.cpp +++ b/kpovmodeler/pmscaleedit.cpp @@ -24,8 +24,8 @@ #include <klocale.h> -PMScaleEdit::PMScaleEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMScaleEdit::PMScaleEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmscaleedit.h b/kpovmodeler/pmscaleedit.h index 19ca04ce..8b6fd8aa 100644 --- a/kpovmodeler/pmscaleedit.h +++ b/kpovmodeler/pmscaleedit.h @@ -39,9 +39,9 @@ class PMScaleEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMScaleEdit with tqparent and name + * Creates a PMScaleEdit with parent and name */ - PMScaleEdit( TQWidget* tqparent, const char* name = 0 ); + PMScaleEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmscene.h b/kpovmodeler/pmscene.h index cc1ec26a..3a93875f 100644 --- a/kpovmodeler/pmscene.h +++ b/kpovmodeler/pmscene.h @@ -31,7 +31,7 @@ * Class for povray scenes. * * A document has a PMScene object as top level object. A PMScene can't have - * a tqparent + * a parent */ class PMScene : public PMCompositeObject { diff --git a/kpovmodeler/pmsettingsdialog.cpp b/kpovmodeler/pmsettingsdialog.cpp index bb747701..35324495 100644 --- a/kpovmodeler/pmsettingsdialog.cpp +++ b/kpovmodeler/pmsettingsdialog.cpp @@ -40,16 +40,16 @@ //#define KPM_WITH_OBJECT_LIBRARY -PMSettingsDialogPage::PMSettingsDialogPage( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +PMSettingsDialogPage::PMSettingsDialogPage( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { } TQSize PMSettingsDialog::s_size = TQSize( 640, 400 ); -PMSettingsDialog::PMSettingsDialog( PMPart* part, TQWidget* tqparent, const char* name ) +PMSettingsDialog::PMSettingsDialog( PMPart* part, TQWidget* parent, const char* name ) : KDialogBase( TreeList, i18n( "Configure" ), Ok | Apply | Cancel | Default, Ok, - tqparent, name ) + parent, name ) { TQStringList sl; TQWidget* w = 0; diff --git a/kpovmodeler/pmsettingsdialog.h b/kpovmodeler/pmsettingsdialog.h index fb862811..e30abf7b 100644 --- a/kpovmodeler/pmsettingsdialog.h +++ b/kpovmodeler/pmsettingsdialog.h @@ -57,7 +57,7 @@ public: /** * Constructor */ - PMSettingsDialogPage( TQWidget* tqparent, const char* name = 0 ); + PMSettingsDialogPage( TQWidget* parent, const char* name = 0 ); /** * Display the settings here. * @@ -132,7 +132,7 @@ public: /** * Standard constructor */ - PMSettingsDialog( PMPart* part, TQWidget* tqparent = 0, const char* name = 0 ); + PMSettingsDialog( PMPart* part, TQWidget* parent = 0, const char* name = 0 ); /** * Registers a new settings page. * diff --git a/kpovmodeler/pmskysphere.cpp b/kpovmodeler/pmskysphere.cpp index f44f2c55..39724548 100644 --- a/kpovmodeler/pmskysphere.cpp +++ b/kpovmodeler/pmskysphere.cpp @@ -69,8 +69,8 @@ TQString PMSkySphere::description( ) const return i18n( "skysphere" ); } -PMDialogEditBase* PMSkySphere::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMSkySphere::editWidget( TQWidget* parent ) const { - return new PMSkySphereEdit( tqparent ); + return new PMSkySphereEdit( parent ); } diff --git a/kpovmodeler/pmskysphere.h b/kpovmodeler/pmskysphere.h index ef14cbd8..d466cb68 100644 --- a/kpovmodeler/pmskysphere.h +++ b/kpovmodeler/pmskysphere.h @@ -59,7 +59,7 @@ public: /** * Returns a new @ref PMSkySphereEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmskysphere" ); } diff --git a/kpovmodeler/pmskysphereedit.cpp b/kpovmodeler/pmskysphereedit.cpp index 4cab0157..4a1590b2 100644 --- a/kpovmodeler/pmskysphereedit.cpp +++ b/kpovmodeler/pmskysphereedit.cpp @@ -25,8 +25,8 @@ #include <klocale.h> -PMSkySphereEdit::PMSkySphereEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMSkySphereEdit::PMSkySphereEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmskysphereedit.h b/kpovmodeler/pmskysphereedit.h index 2f8c811e..1135e583 100644 --- a/kpovmodeler/pmskysphereedit.h +++ b/kpovmodeler/pmskysphereedit.h @@ -38,9 +38,9 @@ class PMSkySphereEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMSkySphereEdit with tqparent and name + * Creates a PMSkySphereEdit with parent and name */ - PMSkySphereEdit( TQWidget* tqparent, const char* name = 0 ); + PMSkySphereEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmslope.cpp b/kpovmodeler/pmslope.cpp index 4cabc973..663a19fe 100644 --- a/kpovmodeler/pmslope.cpp +++ b/kpovmodeler/pmslope.cpp @@ -113,9 +113,9 @@ void PMSlope::setSlope( const double c ) } } -PMDialogEditBase* PMSlope::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMSlope::editWidget( TQWidget* parent ) const { - return new PMSlopeEdit( tqparent ); + return new PMSlopeEdit( parent ); } void PMSlope::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmslope.h b/kpovmodeler/pmslope.h index 12cc28b7..e32455c5 100644 --- a/kpovmodeler/pmslope.h +++ b/kpovmodeler/pmslope.h @@ -65,7 +65,7 @@ public: /** * Returns a new @ref PMSlopeEdit */ - 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/pmslopeedit.cpp b/kpovmodeler/pmslopeedit.cpp index 848565ee..63b0ee44 100644 --- a/kpovmodeler/pmslopeedit.cpp +++ b/kpovmodeler/pmslopeedit.cpp @@ -29,8 +29,8 @@ #include <kdialog.h> -PMSlopeEdit::PMSlopeEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMSlopeEdit::PMSlopeEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmslopeedit.h b/kpovmodeler/pmslopeedit.h index a57816a1..cf262ab9 100644 --- a/kpovmodeler/pmslopeedit.h +++ b/kpovmodeler/pmslopeedit.h @@ -44,9 +44,9 @@ class PMSlopeEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMSlopeEdit with tqparent and name + * Creates a PMSlopeEdit with parent and name */ - PMSlopeEdit( TQWidget* tqparent, const char* name = 0 ); + PMSlopeEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmsolidcolor.cpp b/kpovmodeler/pmsolidcolor.cpp index 0c05f9c9..8ec9ba6d 100644 --- a/kpovmodeler/pmsolidcolor.cpp +++ b/kpovmodeler/pmsolidcolor.cpp @@ -97,9 +97,9 @@ void PMSolidColor::setColor( const PMColor& c ) } } -PMDialogEditBase* PMSolidColor::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMSolidColor::editWidget( TQWidget* parent ) const { - return new PMSolidColorEdit( tqparent ); + return new PMSolidColorEdit( parent ); } void PMSolidColor::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmsolidcolor.h b/kpovmodeler/pmsolidcolor.h index 34e8dbff..8b8b36e9 100644 --- a/kpovmodeler/pmsolidcolor.h +++ b/kpovmodeler/pmsolidcolor.h @@ -66,7 +66,7 @@ public: /** * Returns a new @ref PMSolidColorEdit */ - 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/pmsolidcoloredit.cpp b/kpovmodeler/pmsolidcoloredit.cpp index 9b757d72..62ce6c9e 100644 --- a/kpovmodeler/pmsolidcoloredit.cpp +++ b/kpovmodeler/pmsolidcoloredit.cpp @@ -25,8 +25,8 @@ #include <klocale.h> -PMSolidColorEdit::PMSolidColorEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMSolidColorEdit::PMSolidColorEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmsolidcoloredit.h b/kpovmodeler/pmsolidcoloredit.h index 46bcba07..24e9e82e 100644 --- a/kpovmodeler/pmsolidcoloredit.h +++ b/kpovmodeler/pmsolidcoloredit.h @@ -39,9 +39,9 @@ class PMSolidColorEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMSolidColorEdit with tqparent and name + * Creates a PMSolidColorEdit with parent and name */ - PMSolidColorEdit( TQWidget* tqparent, const char* name = 0 ); + PMSolidColorEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmsolidobjectedit.cpp b/kpovmodeler/pmsolidobjectedit.cpp index 848e7a64..4a1a2205 100644 --- a/kpovmodeler/pmsolidobjectedit.cpp +++ b/kpovmodeler/pmsolidobjectedit.cpp @@ -23,8 +23,8 @@ #include <tqlayout.h> #include <klocale.h> -PMSolidObjectEdit::PMSolidObjectEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMSolidObjectEdit::PMSolidObjectEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmsolidobjectedit.h b/kpovmodeler/pmsolidobjectedit.h index c0a5f52d..21224da6 100644 --- a/kpovmodeler/pmsolidobjectedit.h +++ b/kpovmodeler/pmsolidobjectedit.h @@ -39,9 +39,9 @@ class PMSolidObjectEdit : public PMGraphicalObjectEdit typedef PMGraphicalObjectEdit Base; public: /** - * Creates a PMSolidObjectEdit with tqparent and name + * Creates a PMSolidObjectEdit with parent and name */ - PMSolidObjectEdit( TQWidget* tqparent, const char* name = 0 ); + PMSolidObjectEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmsor.cpp b/kpovmodeler/pmsor.cpp index ae5a34e4..997447c4 100644 --- a/kpovmodeler/pmsor.cpp +++ b/kpovmodeler/pmsor.cpp @@ -253,9 +253,9 @@ void PMSurfaceOfRevolution::setPoints( const TQValueList<PMVector>& points ) } } -PMDialogEditBase* PMSurfaceOfRevolution::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMSurfaceOfRevolution::editWidget( TQWidget* parent ) const { - return new PMSurfaceOfRevolutionEdit( tqparent ); + return new PMSurfaceOfRevolutionEdit( parent ); } void PMSurfaceOfRevolution::createMemento( ) diff --git a/kpovmodeler/pmsor.h b/kpovmodeler/pmsor.h index 6256b280..720987fc 100644 --- a/kpovmodeler/pmsor.h +++ b/kpovmodeler/pmsor.h @@ -71,7 +71,7 @@ public: /** * Returns a new @ref PMSurfaceOfRevolutionEdit */ - 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/pmsoredit.cpp b/kpovmodeler/pmsoredit.cpp index 7bd7eb73..728aa20f 100644 --- a/kpovmodeler/pmsoredit.cpp +++ b/kpovmodeler/pmsoredit.cpp @@ -32,8 +32,8 @@ #include <kiconloader.h> #include <kmessagebox.h> -PMSurfaceOfRevolutionEdit::PMSurfaceOfRevolutionEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMSurfaceOfRevolutionEdit::PMSurfaceOfRevolutionEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmsoredit.h b/kpovmodeler/pmsoredit.h index 3858dd11..41cadff1 100644 --- a/kpovmodeler/pmsoredit.h +++ b/kpovmodeler/pmsoredit.h @@ -47,9 +47,9 @@ class PMSurfaceOfRevolutionEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMSurfaceOfRevolutionEdit with tqparent and name + * Creates a PMSurfaceOfRevolutionEdit with parent and name */ - PMSurfaceOfRevolutionEdit( TQWidget* tqparent, const char* name = 0 ); + PMSurfaceOfRevolutionEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmsphere.cpp b/kpovmodeler/pmsphere.cpp index 8a419a3e..bbdd3b88 100644 --- a/kpovmodeler/pmsphere.cpp +++ b/kpovmodeler/pmsphere.cpp @@ -99,10 +99,10 @@ void PMSphere::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMDialogEditBase* PMSphere::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMSphere::editWidget( TQWidget* parent ) const { - return new PMSphereEdit( tqparent ); + return new PMSphereEdit( parent ); } void PMSphere::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmsphere.h b/kpovmodeler/pmsphere.h index 9450572e..871b7375 100644 --- a/kpovmodeler/pmsphere.h +++ b/kpovmodeler/pmsphere.h @@ -66,7 +66,7 @@ public: /** * Returns a new @ref PMSphereEdit */ - 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/pmsphereedit.cpp b/kpovmodeler/pmsphereedit.cpp index 68d474f0..99bac3ea 100644 --- a/kpovmodeler/pmsphereedit.cpp +++ b/kpovmodeler/pmsphereedit.cpp @@ -26,8 +26,8 @@ #include <tqlabel.h> #include <klocale.h> -PMSphereEdit::PMSphereEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMSphereEdit::PMSphereEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmsphereedit.h b/kpovmodeler/pmsphereedit.h index c5939767..c88b22a7 100644 --- a/kpovmodeler/pmsphereedit.h +++ b/kpovmodeler/pmsphereedit.h @@ -40,9 +40,9 @@ class PMSphereEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMSphereEdit with tqparent and name + * Creates a PMSphereEdit with parent and name */ - PMSphereEdit( TQWidget* tqparent, const char* name = 0 ); + PMSphereEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmspheresweep.cpp b/kpovmodeler/pmspheresweep.cpp index 19ff24b6..ff2e8e1a 100644 --- a/kpovmodeler/pmspheresweep.cpp +++ b/kpovmodeler/pmspheresweep.cpp @@ -290,9 +290,9 @@ void PMSphereSweep::setRadii( const TQValueList<double>& radii ) } } -PMDialogEditBase* PMSphereSweep::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMSphereSweep::editWidget( TQWidget* parent ) const { - return new PMSphereSweepEdit( tqparent ); + return new PMSphereSweepEdit( parent ); } void PMSphereSweep::createMemento( ) diff --git a/kpovmodeler/pmspheresweep.h b/kpovmodeler/pmspheresweep.h index 23909bed..f4488e1b 100644 --- a/kpovmodeler/pmspheresweep.h +++ b/kpovmodeler/pmspheresweep.h @@ -74,7 +74,7 @@ public: /** * Returns a new @ref PMSphereSweepEdit */ - 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/pmspheresweepedit.cpp b/kpovmodeler/pmspheresweepedit.cpp index a10c8e62..9798a304 100644 --- a/kpovmodeler/pmspheresweepedit.cpp +++ b/kpovmodeler/pmspheresweepedit.cpp @@ -34,8 +34,8 @@ #include <kiconloader.h> #include <kmessagebox.h> -PMSphereSweepEdit::PMSphereSweepEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMSphereSweepEdit::PMSphereSweepEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmspheresweepedit.h b/kpovmodeler/pmspheresweepedit.h index c6b8a9f1..753ccb12 100644 --- a/kpovmodeler/pmspheresweepedit.h +++ b/kpovmodeler/pmspheresweepedit.h @@ -48,9 +48,9 @@ class PMSphereSweepEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMSphereSweepEdit with tqparent and name + * Creates a PMSphereSweepEdit with parent and name */ - PMSphereSweepEdit( TQWidget* tqparent, const char* name = 0 ); + PMSphereSweepEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmsqe.cpp b/kpovmodeler/pmsqe.cpp index 4d79d218..8a0946fb 100644 --- a/kpovmodeler/pmsqe.cpp +++ b/kpovmodeler/pmsqe.cpp @@ -133,9 +133,9 @@ void PMSuperquadricEllipsoid::setNorthSouthExponent( double n ) } } -PMDialogEditBase* PMSuperquadricEllipsoid::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMSuperquadricEllipsoid::editWidget( TQWidget* parent ) const { - return new PMSuperquadricEllipsoidEdit( tqparent ); + return new PMSuperquadricEllipsoidEdit( parent ); } void PMSuperquadricEllipsoid::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmsqe.h b/kpovmodeler/pmsqe.h index 17a2aded..835f52c0 100644 --- a/kpovmodeler/pmsqe.h +++ b/kpovmodeler/pmsqe.h @@ -67,7 +67,7 @@ public: /** * Returns a new @ref PMSuperquadricEllipsoidEdit */ - 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/pmsqeedit.cpp b/kpovmodeler/pmsqeedit.cpp index 1cb02f89..377b552b 100644 --- a/kpovmodeler/pmsqeedit.cpp +++ b/kpovmodeler/pmsqeedit.cpp @@ -24,8 +24,8 @@ #include <tqlabel.h> #include <klocale.h> -PMSuperquadricEllipsoidEdit::PMSuperquadricEllipsoidEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMSuperquadricEllipsoidEdit::PMSuperquadricEllipsoidEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmsqeedit.h b/kpovmodeler/pmsqeedit.h index 6cde9fc4..4f870ced 100644 --- a/kpovmodeler/pmsqeedit.h +++ b/kpovmodeler/pmsqeedit.h @@ -39,9 +39,9 @@ class PMSuperquadricEllipsoidEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMSuperquadricEllipsoidEdit with tqparent and name + * Creates a PMSuperquadricEllipsoidEdit with parent and name */ - PMSuperquadricEllipsoidEdit( TQWidget* tqparent, const char* name = 0 ); + PMSuperquadricEllipsoidEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmtext.cpp b/kpovmodeler/pmtext.cpp index d67edf2e..e4b7f0da 100644 --- a/kpovmodeler/pmtext.cpp +++ b/kpovmodeler/pmtext.cpp @@ -162,9 +162,9 @@ void PMText::setOffset( const PMVector& o ) } } -PMDialogEditBase* PMText::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMText::editWidget( TQWidget* parent ) const { - return new PMTextEdit( tqparent ); + return new PMTextEdit( parent ); } void PMText::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmtext.h b/kpovmodeler/pmtext.h index 3c7037ac..5b769dc7 100644 --- a/kpovmodeler/pmtext.h +++ b/kpovmodeler/pmtext.h @@ -67,7 +67,7 @@ public: /** * Returns a new @ref PMTextEdit */ - 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/pmtextedit.cpp b/kpovmodeler/pmtextedit.cpp index 84dcec3d..e1e4e038 100644 --- a/kpovmodeler/pmtextedit.cpp +++ b/kpovmodeler/pmtextedit.cpp @@ -29,8 +29,8 @@ #include <kiconloader.h> #include <kfiledialog.h> -PMTextEdit::PMTextEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMTextEdit::PMTextEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmtextedit.h b/kpovmodeler/pmtextedit.h index 96510257..9d90c68c 100644 --- a/kpovmodeler/pmtextedit.h +++ b/kpovmodeler/pmtextedit.h @@ -42,9 +42,9 @@ class PMTextEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMTextEdit with tqparent and name + * Creates a PMTextEdit with parent and name */ - PMTextEdit( TQWidget* tqparent, const char* name = 0 ); + PMTextEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmtexture.cpp b/kpovmodeler/pmtexture.cpp index e7046834..3ae367dd 100644 --- a/kpovmodeler/pmtexture.cpp +++ b/kpovmodeler/pmtexture.cpp @@ -72,9 +72,9 @@ TQString PMTexture::description( ) const return i18n( "texture" ); } -PMDialogEditBase* PMTexture::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMTexture::editWidget( TQWidget* parent ) const { - return new PMTextureEdit( tqparent ); + return new PMTextureEdit( parent ); } void PMTexture::serialize( TQDomElement& e, TQDomDocument& doc ) const diff --git a/kpovmodeler/pmtexture.h b/kpovmodeler/pmtexture.h index f247d09a..daeaf427 100644 --- a/kpovmodeler/pmtexture.h +++ b/kpovmodeler/pmtexture.h @@ -64,7 +64,7 @@ public: /** * Returns a new @ref PMTextureEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmtexture" ); } diff --git a/kpovmodeler/pmtexturebaseedit.cpp b/kpovmodeler/pmtexturebaseedit.cpp index 7591538b..0768adc1 100644 --- a/kpovmodeler/pmtexturebaseedit.cpp +++ b/kpovmodeler/pmtexturebaseedit.cpp @@ -25,8 +25,8 @@ #include <klocale.h> -PMTextureBaseEdit::PMTextureBaseEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMTextureBaseEdit::PMTextureBaseEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmtexturebaseedit.h b/kpovmodeler/pmtexturebaseedit.h index 8178b612..3969c7b0 100644 --- a/kpovmodeler/pmtexturebaseedit.h +++ b/kpovmodeler/pmtexturebaseedit.h @@ -39,9 +39,9 @@ class PMTextureBaseEdit : public PMNamedObjectEdit typedef PMNamedObjectEdit Base; public: /** - * Creates a PMTextureBaseEdit with tqparent and name + * Creates a PMTextureBaseEdit with parent and name */ - PMTextureBaseEdit( TQWidget* tqparent, const char* name = 0 ); + PMTextureBaseEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmtextureedit.cpp b/kpovmodeler/pmtextureedit.cpp index a6bf2b94..768cc3cc 100644 --- a/kpovmodeler/pmtextureedit.cpp +++ b/kpovmodeler/pmtextureedit.cpp @@ -25,8 +25,8 @@ #include <klocale.h> -PMTextureEdit::PMTextureEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMTextureEdit::PMTextureEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmtextureedit.h b/kpovmodeler/pmtextureedit.h index 21852ad9..a04b2d93 100644 --- a/kpovmodeler/pmtextureedit.h +++ b/kpovmodeler/pmtextureedit.h @@ -39,9 +39,9 @@ class PMTextureEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMTextureEdit with tqparent and name + * Creates a PMTextureEdit with parent and name */ - PMTextureEdit( TQWidget* tqparent, const char* name = 0 ); + PMTextureEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmtexturemap.cpp b/kpovmodeler/pmtexturemap.cpp index 20287432..dc9f3b76 100644 --- a/kpovmodeler/pmtexturemap.cpp +++ b/kpovmodeler/pmtexturemap.cpp @@ -158,9 +158,9 @@ void PMTextureMapBase::cleanUp( ) const Base::cleanUp( ); } -PMDialogEditBase* PMTextureMapBase::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMTextureMapBase::editWidget( TQWidget* parent ) const { - return new PMTextureMapEdit( tqparent ); + return new PMTextureMapEdit( parent ); } void PMTextureMapBase::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmtexturemap.h b/kpovmodeler/pmtexturemap.h index b08a3770..26907ed3 100644 --- a/kpovmodeler/pmtexturemap.h +++ b/kpovmodeler/pmtexturemap.h @@ -76,7 +76,7 @@ public: /** * Returns a new @ref PMTextureMapEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual void createMemento( ); diff --git a/kpovmodeler/pmtexturemapedit.cpp b/kpovmodeler/pmtexturemapedit.cpp index efb77c15..2efa7708 100644 --- a/kpovmodeler/pmtexturemapedit.cpp +++ b/kpovmodeler/pmtexturemapedit.cpp @@ -26,8 +26,8 @@ #include <kmessagebox.h> -PMTextureMapEdit::PMTextureMapEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMTextureMapEdit::PMTextureMapEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; m_numValues = 0; diff --git a/kpovmodeler/pmtexturemapedit.h b/kpovmodeler/pmtexturemapedit.h index 7ca57401..4a8f3c19 100644 --- a/kpovmodeler/pmtexturemapedit.h +++ b/kpovmodeler/pmtexturemapedit.h @@ -43,9 +43,9 @@ class PMTextureMapEdit : public PMTextureBaseEdit typedef PMTextureBaseEdit Base; public: /** - * Creates a PMTextureMapEdit with tqparent and name + * Creates a PMTextureMapEdit with parent and name */ - PMTextureMapEdit( TQWidget* tqparent, const char* name = 0 ); + PMTextureMapEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmtorus.cpp b/kpovmodeler/pmtorus.cpp index 0039713b..a32d04e7 100644 --- a/kpovmodeler/pmtorus.cpp +++ b/kpovmodeler/pmtorus.cpp @@ -110,10 +110,10 @@ void PMTorus::readAttributes( const PMXMLHelper& h ) Base::readAttributes( h ); } -PMDialogEditBase* PMTorus::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMTorus::editWidget( TQWidget* parent ) const { - return new PMTorusEdit( tqparent ); + return new PMTorusEdit( parent ); } void PMTorus::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmtorus.h b/kpovmodeler/pmtorus.h index 65f8458f..59b16e3c 100644 --- a/kpovmodeler/pmtorus.h +++ b/kpovmodeler/pmtorus.h @@ -67,7 +67,7 @@ public: /** * Returns a new @ref PMTrousEdit */ - 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/pmtorusedit.cpp b/kpovmodeler/pmtorusedit.cpp index f497018f..e47301b9 100644 --- a/kpovmodeler/pmtorusedit.cpp +++ b/kpovmodeler/pmtorusedit.cpp @@ -26,8 +26,8 @@ #include <tqcheckbox.h> -PMTorusEdit::PMTorusEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMTorusEdit::PMTorusEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmtorusedit.h b/kpovmodeler/pmtorusedit.h index 95870664..e60256e3 100644 --- a/kpovmodeler/pmtorusedit.h +++ b/kpovmodeler/pmtorusedit.h @@ -39,9 +39,9 @@ class PMTorusEdit : public PMSolidObjectEdit typedef PMSolidObjectEdit Base; public: /** - * Creates a PMSphereEdit with tqparent and name + * Creates a PMSphereEdit with parent and name */ - PMTorusEdit( TQWidget* tqparent, const char* name = 0 ); + PMTorusEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmtranslate.cpp b/kpovmodeler/pmtranslate.cpp index 08611749..0cbfe58d 100644 --- a/kpovmodeler/pmtranslate.cpp +++ b/kpovmodeler/pmtranslate.cpp @@ -101,9 +101,9 @@ void PMTranslate::setTranslation( const PMVector& p ) } } -PMDialogEditBase* PMTranslate::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMTranslate::editWidget( TQWidget* parent ) const { - return new PMTranslateEdit( tqparent ); + return new PMTranslateEdit( parent ); } void PMTranslate::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmtranslate.h b/kpovmodeler/pmtranslate.h index 59b428a7..e121615d 100644 --- a/kpovmodeler/pmtranslate.h +++ b/kpovmodeler/pmtranslate.h @@ -65,7 +65,7 @@ public: /** * Returns a new @ref PMTranslateEdit */ - virtual PMDialogEditBase* editWidget( TQWidget* tqparent ) const; + virtual PMDialogEditBase* editWidget( TQWidget* parent ) const; /** */ virtual TQString pixmap( ) const { return TQString( "pmtranslate" ); } diff --git a/kpovmodeler/pmtranslateedit.cpp b/kpovmodeler/pmtranslateedit.cpp index 4796714f..f98bcf00 100644 --- a/kpovmodeler/pmtranslateedit.cpp +++ b/kpovmodeler/pmtranslateedit.cpp @@ -24,8 +24,8 @@ #include <klocale.h> -PMTranslateEdit::PMTranslateEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMTranslateEdit::PMTranslateEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmtranslateedit.h b/kpovmodeler/pmtranslateedit.h index 955a6243..b15dbcec 100644 --- a/kpovmodeler/pmtranslateedit.h +++ b/kpovmodeler/pmtranslateedit.h @@ -39,9 +39,9 @@ class PMTranslateEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMTranslateEdit with tqparent and name + * Creates a PMTranslateEdit with parent and name */ - PMTranslateEdit( TQWidget* tqparent, const char* name = 0 ); + PMTranslateEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmtreeview.cpp b/kpovmodeler/pmtreeview.cpp index 03eb8f7b..8ec640d7 100644 --- a/kpovmodeler/pmtreeview.cpp +++ b/kpovmodeler/pmtreeview.cpp @@ -38,9 +38,9 @@ #include "pmobjectdrag.h" -PMTreeViewWidget::PMTreeViewWidget( PMPart* part, TQWidget* tqparent /*= 0*/, +PMTreeViewWidget::PMTreeViewWidget( PMPart* part, TQWidget* parent /*= 0*/, const char* name /*=0*/ ) - : PMViewBase( tqparent, name ) + : PMViewBase( parent, name ) { TQHBoxLayout* hl = new TQHBoxLayout( this ); PMTreeView* tv = new PMTreeView( part, this ); @@ -52,9 +52,9 @@ TQString PMTreeViewWidget::description( ) const return i18n( "Object Tree" ); } -PMTreeView::PMTreeView( PMPart* part, TQWidget* tqparent /*= 0*/, +PMTreeView::PMTreeView( PMPart* part, TQWidget* parent /*= 0*/, const char* name /*= 0*/ ) - : TQListView( tqparent, name ) + : TQListView( parent, name ) { addColumn( i18n( "Objects" ) ); header( )->hide( ); @@ -106,15 +106,15 @@ void PMTreeView::slotObjectChanged( PMObject* obj, const int mode, if( ( mode & PMCAdd ) && !( mode & PMCInsertError ) ) { // object was added - if( !obj->tqparent( ) ) + if( !obj->parent( ) ) { - // object has no tqparent, append it as top level item + // object has no parent, append it as top level item pTreeItem = new PMTreeViewItem( obj, this ); } else { - // find the tqparent in the listview - TQListViewItem* pParentTreeItem = findObject( obj->tqparent( ) ); + // find the parent in the listview + TQListViewItem* pParentTreeItem = findObject( obj->parent( ) ); if( pParentTreeItem ) { PMObject* hObj = obj->prevSibling( ); @@ -186,7 +186,7 @@ void PMTreeView::slotObjectChanged( PMObject* obj, const int mode, if( pTreeItem ) { PMTreeViewItem* p; - for( p = pTreeItem->tqparent( ); p; p = p->tqparent( ) ) + for( p = pTreeItem->parent( ); p; p = p->parent( ) ) p->setOpen( true ); pTreeItem->setSelected( true ); setCurrentItem( pTreeItem ); @@ -238,7 +238,7 @@ PMTreeViewItem* PMTreeView::findObject( const PMObject* obj ) { PMTreeViewItem* pTreeItem = 0; - if( !obj->tqparent( ) ) + if( !obj->parent( ) ) { // top level object pTreeItem = ( PMTreeViewItem* ) firstChild( ); @@ -248,7 +248,7 @@ PMTreeViewItem* PMTreeView::findObject( const PMObject* obj ) } else { - pTreeItem = findObject( obj->tqparent( ) ); + pTreeItem = findObject( obj->parent( ) ); if( pTreeItem ) { pTreeItem = ( PMTreeViewItem* ) pTreeItem->firstChild( ); @@ -269,7 +269,7 @@ void PMTreeView::selectItem( TQListViewItem* /*sitem*/ ) m_pSelectedObject = ( ( PMTreeViewItem* ) sitem )->object( ); - for( pItem = sitem->tqparent( ); pItem; pItem = pItem->tqparent( ) ) + for( pItem = sitem->parent( ); pItem; pItem = pItem->parent( ) ) pItem->setOpen( true ); ensureItemVisible( sitem ); setCurrentItem( sitem ); @@ -389,11 +389,11 @@ void PMTreeView::contentsMousePressEvent( TQMouseEvent * e ) else if( ( e->state( ) & ShiftButton ) && oldCurrent && m_pLastSelected ) { if( ( oldCurrent != m_pLastSelected ) && - ( oldCurrent->tqparent( ) == m_pLastSelected->tqparent( ) ) ) + ( oldCurrent->parent( ) == m_pLastSelected->parent( ) ) ) { specialAction = true; - // shift click, old current item has the same tqparent + // shift click, old current item has the same parent // as the new selection. Select all items between the two // items if( m_pLastSelected->object( )->isSelectable( ) ) @@ -628,8 +628,8 @@ void PMTreeView::viewportDragMoveEvent( TQDragMoveEvent *e ) accept = false; if( !obj->isReadOnly( ) ) accept = true; - if( obj->tqparent( ) ) - if( !obj->tqparent( )->isReadOnly( ) ) + if( obj->parent( ) ) + if( !obj->parent( )->isReadOnly( ) ) accept = true; } } @@ -733,7 +733,7 @@ void PMTreeView::keyPressEvent( TQKeyEvent* e ) accept = true; break; case TQt::Key_Left: - newSelection = current->tqparent( ); + newSelection = current->parent( ); accept = true; break; case TQt::Key_Right: diff --git a/kpovmodeler/pmtreeview.h b/kpovmodeler/pmtreeview.h index 445b53fd..7b9ea1d0 100644 --- a/kpovmodeler/pmtreeview.h +++ b/kpovmodeler/pmtreeview.h @@ -41,7 +41,7 @@ public: /** * Default constructor */ - PMTreeViewWidget( PMPart* pare, TQWidget* tqparent, const char* name = 0 ); + PMTreeViewWidget( PMPart* pare, TQWidget* parent, const char* name = 0 ); /** */ virtual TQString viewType( ) const { return TQString( "treeview" ); } @@ -59,10 +59,10 @@ class PMTreeView : public TQListView friend class PMTreeViewItem; public: /** - * Creates a PMTreeView with tqparent and name that displays the + * Creates a PMTreeView with parent and name that displays the * document doc */ - PMTreeView( PMPart* part, TQWidget* tqparent = 0, const char* name = 0 ); + PMTreeView( PMPart* part, TQWidget* parent = 0, const char* name = 0 ); /** * Deletes the PMTreeView */ @@ -174,9 +174,9 @@ public: virtual TQString viewType( ) const { return TQString( "treeview" ); } virtual TQString description( ) const; virtual TQString iconName( ) const { return TQString( "pmtreeview" ); } - virtual PMViewBase* newInstance( TQWidget* tqparent, PMPart* part ) const + virtual PMViewBase* newInstance( TQWidget* parent, PMPart* part ) const { - return new PMTreeViewWidget( part, tqparent ); + return new PMTreeViewWidget( part, parent ); } }; diff --git a/kpovmodeler/pmtreeviewitem.cpp b/kpovmodeler/pmtreeviewitem.cpp index e167e86b..e3017b40 100644 --- a/kpovmodeler/pmtreeviewitem.cpp +++ b/kpovmodeler/pmtreeviewitem.cpp @@ -24,34 +24,34 @@ #include "pmfactory.h" #include "pmtexturemap.h" -PMTreeViewItem::PMTreeViewItem( PMObject* object, TQListView* tqparent ) - : TQListViewItem( tqparent ) +PMTreeViewItem::PMTreeViewItem( PMObject* object, TQListView* parent ) + : TQListViewItem( parent ) { m_pObject = object; setDescriptions( ); initSelection( ); } -PMTreeViewItem::PMTreeViewItem( PMObject* object, TQListViewItem* tqparent ) - : TQListViewItem( tqparent ) +PMTreeViewItem::PMTreeViewItem( PMObject* object, TQListViewItem* parent ) + : TQListViewItem( parent ) { m_pObject = object; setDescriptions( ); initSelection( ); } -PMTreeViewItem::PMTreeViewItem( PMObject* object, TQListView* tqparent, +PMTreeViewItem::PMTreeViewItem( PMObject* object, TQListView* parent, TQListViewItem* after ) - : TQListViewItem( tqparent, after ) + : TQListViewItem( parent, after ) { m_pObject = object; setDescriptions( ); initSelection( ); } -PMTreeViewItem::PMTreeViewItem( PMObject* object, TQListViewItem* tqparent, +PMTreeViewItem::PMTreeViewItem( PMObject* object, TQListViewItem* parent, TQListViewItem* after ) - : TQListViewItem( tqparent, after ) + : TQListViewItem( parent, after ) { m_pObject = object; setDescriptions( ); @@ -72,11 +72,11 @@ void PMTreeViewItem::setDescriptions( ) else text = m_pObject->description( ); - if( m_pObject->tqparent( ) ) + if( m_pObject->parent( ) ) { - if( m_pObject->tqparent( )->isA( "TextureMapBase" ) ) + if( m_pObject->parent( )->isA( "TextureMapBase" ) ) { - PMTextureMapBase* tm = ( PMTextureMapBase* ) m_pObject->tqparent( ); + PMTextureMapBase* tm = ( PMTextureMapBase* ) m_pObject->parent( ); if( m_pObject->type( ) == tm->mapType( ) ) text = TQString( "[%1] " ).tqarg( tm->mapValue( m_pObject ), 4, 'f', 2 ) + text; } @@ -87,8 +87,8 @@ void PMTreeViewItem::setDescriptions( ) TQString PMTreeViewItem::key( int, bool ) const { TQString result; - if( m_pObject->tqparent( ) ) - result.sprintf( "%06i", m_pObject->tqparent( )->findChild( m_pObject ) ); + if( m_pObject->parent( ) ) + result.sprintf( "%06i", m_pObject->parent( )->findChild( m_pObject ) ); else result = "000000"; return result; diff --git a/kpovmodeler/pmtreeviewitem.h b/kpovmodeler/pmtreeviewitem.h index 81fdeb96..7792871a 100644 --- a/kpovmodeler/pmtreeviewitem.h +++ b/kpovmodeler/pmtreeviewitem.h @@ -36,24 +36,24 @@ class PMTreeViewItem : public TQListViewItem { public: /** - * Constructs a new top-level list view item in the TQListView tqparent. + * Constructs a new top-level list view item in the TQListView parent. */ - PMTreeViewItem( PMObject* object, TQListView* tqparent ); + PMTreeViewItem( PMObject* object, TQListView* parent ); /** - * Constructs a new list view item which is a child of tqparent and - * first in the tqparent's list of tqchildren. + * Constructs a new list view item which is a child of parent and + * first in the parent's list of tqchildren. */ - PMTreeViewItem( PMObject* object, TQListViewItem* tqparent ); + PMTreeViewItem( PMObject* object, TQListViewItem* parent ); /** - * Constructs a list view item which is a child of tqparent - * and is after after in the tqparent's list of tqchildren. + * Constructs a list view item which is a child of parent + * and is after after in the parent's list of tqchildren. */ - PMTreeViewItem( PMObject* object, TQListView* tqparent, TQListViewItem* after ); + PMTreeViewItem( PMObject* object, TQListView* parent, TQListViewItem* after ); /** - * Constructs a list view item which is a child of tqparent - * and is after after in the tqparent's list of tqchildren. + * Constructs a list view item which is a child of parent + * and is after after in the parent's list of tqchildren. */ - PMTreeViewItem( PMObject* object, TQListViewItem* tqparent, + PMTreeViewItem( PMObject* object, TQListViewItem* parent, TQListViewItem* after ); /** * Returns the connected @ref PMObject @@ -65,11 +65,11 @@ public: */ virtual TQString key( int column, bool ascending ) const; /** - * Returns a pointer to the tqparent item + * Returns a pointer to the parent item */ - PMTreeViewItem* tqparent( ) + PMTreeViewItem* parent( ) { - return ( PMTreeViewItem* ) TQListViewItem::tqparent( ); + return ( PMTreeViewItem* ) TQListViewItem::parent( ); } void setSelected( bool select ); diff --git a/kpovmodeler/pmtriangle.cpp b/kpovmodeler/pmtriangle.cpp index 362ae868..db88443e 100644 --- a/kpovmodeler/pmtriangle.cpp +++ b/kpovmodeler/pmtriangle.cpp @@ -345,9 +345,9 @@ void PMTriangle::enableUV( bool yes ) } } -PMDialogEditBase* PMTriangle::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMTriangle::editWidget( TQWidget* parent ) const { - return new PMTriangleEdit( tqparent ); + return new PMTriangleEdit( parent ); } void PMTriangle::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmtriangle.h b/kpovmodeler/pmtriangle.h index fbff523d..aeb590d2 100644 --- a/kpovmodeler/pmtriangle.h +++ b/kpovmodeler/pmtriangle.h @@ -65,7 +65,7 @@ public: /** * Returns a new @ref PMTriangleEdit */ - 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/pmtriangleedit.cpp b/kpovmodeler/pmtriangleedit.cpp index 0fde6e22..b6d544a0 100644 --- a/kpovmodeler/pmtriangleedit.cpp +++ b/kpovmodeler/pmtriangleedit.cpp @@ -27,8 +27,8 @@ #include <klocale.h> #include <kmessagebox.h> -PMTriangleEdit::PMTriangleEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMTriangleEdit::PMTriangleEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmtriangleedit.h b/kpovmodeler/pmtriangleedit.h index b1982f57..58ecf8ee 100644 --- a/kpovmodeler/pmtriangleedit.h +++ b/kpovmodeler/pmtriangleedit.h @@ -42,9 +42,9 @@ class PMTriangleEdit : public PMGraphicalObjectEdit typedef PMGraphicalObjectEdit Base; public: /** - * Creates a PMTriangleEdit with tqparent and name + * Creates a PMTriangleEdit with parent and name */ - PMTriangleEdit( TQWidget* tqparent, const char* name = 0 ); + PMTriangleEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmunknownview.cpp b/kpovmodeler/pmunknownview.cpp index 60b65658..646aa619 100644 --- a/kpovmodeler/pmunknownview.cpp +++ b/kpovmodeler/pmunknownview.cpp @@ -20,8 +20,8 @@ #include <tqlayout.h> PMUnknownView::PMUnknownView( const TQString& viewType, - TQWidget* tqparent, const char* name ) - : PMViewBase( tqparent, name ) + TQWidget* parent, const char* name ) + : PMViewBase( parent, name ) { TQHBoxLayout* hl = new TQHBoxLayout( this ); TQLabel* l; diff --git a/kpovmodeler/pmunknownview.h b/kpovmodeler/pmunknownview.h index 8947b689..dbb5d042 100644 --- a/kpovmodeler/pmunknownview.h +++ b/kpovmodeler/pmunknownview.h @@ -34,7 +34,7 @@ public: /** * Default constructor */ - PMUnknownView( const TQString& viewType, TQWidget* tqparent, + PMUnknownView( const TQString& viewType, TQWidget* parent, const char* name = 0 ); /** */ virtual TQString viewType( ) const { return m_viewType; } diff --git a/kpovmodeler/pmvectoredit.cpp b/kpovmodeler/pmvectoredit.cpp index 5140f297..79075dc3 100644 --- a/kpovmodeler/pmvectoredit.cpp +++ b/kpovmodeler/pmvectoredit.cpp @@ -28,8 +28,8 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionX, const TQString& descriptionY, - TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) + TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { unsigned int i; TQHBoxLayout* tqlayout; @@ -66,8 +66,8 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionX, PMVectorEdit::PMVectorEdit( const TQString& descriptionX, const TQString& descriptionY, const TQString& descriptionZ, - TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) + TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { unsigned int i; TQHBoxLayout* tqlayout; @@ -114,8 +114,8 @@ PMVectorEdit::PMVectorEdit( const TQString& descriptionA, const TQString& descriptionB, const TQString& descriptionC, const TQString& descriptionD, - TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) + TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { unsigned int i; TQHBoxLayout* tqlayout; diff --git a/kpovmodeler/pmvectoredit.h b/kpovmodeler/pmvectoredit.h index 9f46a147..b73663c6 100644 --- a/kpovmodeler/pmvectoredit.h +++ b/kpovmodeler/pmvectoredit.h @@ -44,7 +44,7 @@ public: */ PMVectorEdit( const TQString& descriptionX, const TQString& descriptionY, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); /** * Creates an edit widget for 3D vectors. * @@ -52,7 +52,7 @@ public: */ PMVectorEdit( const TQString& descriptionX, const TQString& descriptionY, const TQString& descriptionZ, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); /** * Creates an edit widget for 4D vectors. * @@ -61,7 +61,7 @@ public: */ PMVectorEdit( const TQString& descriptionA, const TQString& descriptionB, const TQString& descriptionC, const TQString& descriptionD, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); /** * Sets the displayed vector diff --git a/kpovmodeler/pmvectorlistedit.cpp b/kpovmodeler/pmvectorlistedit.cpp index e6d4385a..fed18026 100644 --- a/kpovmodeler/pmvectorlistedit.cpp +++ b/kpovmodeler/pmvectorlistedit.cpp @@ -57,8 +57,8 @@ void PMTableItem::paint( TQPainter* p, const TQColorGroup& cg, } */ -PMVectorListEdit::PMVectorListEdit( TQWidget* tqparent, const char* name ) - : TQTable( 1, 3, tqparent, name ) +PMVectorListEdit::PMVectorListEdit( TQWidget* parent, const char* name ) + : TQTable( 1, 3, parent, name ) { init( 3 ); @@ -70,8 +70,8 @@ PMVectorListEdit::PMVectorListEdit( TQWidget* tqparent, const char* name ) PMVectorListEdit::PMVectorListEdit( const TQString& c1, const TQString& c2, const TQString& c3, const TQString& c4, - TQWidget* tqparent, const char* name ) - : TQTable( 1, 4, tqparent, name ) + TQWidget* parent, const char* name ) + : TQTable( 1, 4, parent, name ) { init( 4 ); @@ -83,9 +83,9 @@ PMVectorListEdit::PMVectorListEdit( const TQString& c1, const TQString& c2, } PMVectorListEdit::PMVectorListEdit( const TQString& c1, const TQString& c2, - const TQString& c3, TQWidget* tqparent, + const TQString& c3, TQWidget* parent, const char* name ) - : TQTable( 1, 3, tqparent, name ) + : TQTable( 1, 3, parent, name ) { init( 3 ); @@ -96,8 +96,8 @@ PMVectorListEdit::PMVectorListEdit( const TQString& c1, const TQString& c2, } PMVectorListEdit::PMVectorListEdit( const TQString& c1, const TQString& c2, - TQWidget* tqparent, const char* name ) - : TQTable( 1, 2, tqparent, name ) + TQWidget* parent, const char* name ) + : TQTable( 1, 2, parent, name ) { init( 2 ); @@ -342,8 +342,8 @@ void PMVectorListEdit::blockSelectionUpdates( bool block ) bool PMVectorListEdit::eventFilter( TQObject* o, TQEvent* e ) { - if( e->type( ) == TQEvent::Wheel && tqparent( ) ) - return TQApplication::sendEvent( tqparent( ), e ); + if( e->type( ) == TQEvent::Wheel && parent( ) ) + return TQApplication::sendEvent( parent( ), e ); if( e->type( ) == TQEvent::MouseButtonPress && ( ( TQMouseEvent* ) e )->button( ) == Qt::RightButton ) { diff --git a/kpovmodeler/pmvectorlistedit.h b/kpovmodeler/pmvectorlistedit.h index e00190f8..d415e9a9 100644 --- a/kpovmodeler/pmvectorlistedit.h +++ b/kpovmodeler/pmvectorlistedit.h @@ -62,23 +62,23 @@ public: /** * Constructor for 3d vectors (x, y, z) */ - PMVectorListEdit( TQWidget* tqparent, const char* name = 0 ); + PMVectorListEdit( TQWidget* parent, const char* name = 0 ); /** * Constructor for 3d vectors */ PMVectorListEdit( const TQString& c1, const TQString& c2, const TQString& c3, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); /** * Constructor for 2d vectors */ PMVectorListEdit( const TQString& c1, const TQString& c2, - TQWidget* tqparent, const char* name = 0 ); + TQWidget* parent, const char* name = 0 ); /** * Constructor for 4d vectors */ PMVectorListEdit( const TQString& c1, const TQString& c2, const TQString& c3, - const TQString& c4, TQWidget* tqparent, const char* name = 0 ); + const TQString& c4, TQWidget* parent, const char* name = 0 ); /** * Sets and displays the vectors. The widget will automatically * resize if no link is set and resize is true. diff --git a/kpovmodeler/pmview.cpp b/kpovmodeler/pmview.cpp index 2fab58d9..98fb2f61 100644 --- a/kpovmodeler/pmview.cpp +++ b/kpovmodeler/pmview.cpp @@ -34,8 +34,8 @@ #include "pmdialogview.h" #include "pmglview.h" -PMView::PMView( PMPart* part, TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +PMView::PMView( PMPart* part, TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { setBackgroundMode( PaletteBase ); diff --git a/kpovmodeler/pmview.h b/kpovmodeler/pmview.h index 9ad1c7b9..3a4d9f2a 100644 --- a/kpovmodeler/pmview.h +++ b/kpovmodeler/pmview.h @@ -44,7 +44,7 @@ public: /** * Constructor for the main view */ - PMView( PMPart* part, TQWidget* tqparent = 0, const char* name = 0 ); + PMView( PMPart* part, TQWidget* parent = 0, const char* name = 0 ); /** * Destructor for the main view */ diff --git a/kpovmodeler/pmviewbase.h b/kpovmodeler/pmviewbase.h index 1268694f..68febcf4 100644 --- a/kpovmodeler/pmviewbase.h +++ b/kpovmodeler/pmviewbase.h @@ -70,8 +70,8 @@ public: /** * Default constructor */ - PMViewOptionsWidget( TQWidget* tqparent, const char* name = 0 ) - : TQWidget( tqparent, name ) + PMViewOptionsWidget( TQWidget* parent, const char* name = 0 ) + : TQWidget( parent, name ) { } @@ -96,8 +96,8 @@ public: /** * Default constructor */ - PMViewBase( TQWidget* tqparent, const char* name = 0, WFlags f = 0 ) - : TQWidget( tqparent, name, f ) + PMViewBase( TQWidget* parent, const char* name = 0, WFlags f = 0 ) + : TQWidget( parent, name, f ) { } /** diff --git a/kpovmodeler/pmviewfactory.cpp b/kpovmodeler/pmviewfactory.cpp index ac4704b6..804c787c 100644 --- a/kpovmodeler/pmviewfactory.cpp +++ b/kpovmodeler/pmviewfactory.cpp @@ -62,11 +62,11 @@ void PMViewFactory::addViewType( PMViewTypeFactory* vt ) } PMViewBase* PMViewFactory::newViewInstance( const TQString& viewType, - TQWidget* tqparent, PMPart* part ) const + TQWidget* parent, PMPart* part ) const { PMViewTypeFactory* f = m_dict.find( viewType ); if( f ) - return f->newInstance( tqparent, part ); + return f->newInstance( parent, part ); kdError( PMArea ) << "Unknown view type \"" << viewType << "\"" << endl; return 0; diff --git a/kpovmodeler/pmviewfactory.h b/kpovmodeler/pmviewfactory.h index 78f8981f..5fd42c1a 100644 --- a/kpovmodeler/pmviewfactory.h +++ b/kpovmodeler/pmviewfactory.h @@ -72,7 +72,7 @@ public: /** * Returns a new view instance */ - virtual PMViewBase* newInstance( TQWidget* tqparent, PMPart* part ) const = 0; + virtual PMViewBase* newInstance( TQWidget* parent, PMPart* part ) const = 0; /** * Creates a config object for the view type. * If the view doesn't have special attributes, the function returns 0; @@ -116,7 +116,7 @@ public: * Returns a new view of type viewType if available */ PMViewBase* newViewInstance( const TQString& viewType, - TQWidget* tqparent, PMPart* part ) const; + TQWidget* parent, PMPart* part ) const; /** * Returns a new view option instance for the given view type */ diff --git a/kpovmodeler/pmviewlayoutmanager.cpp b/kpovmodeler/pmviewlayoutmanager.cpp index 4b57d728..e6f9148c 100644 --- a/kpovmodeler/pmviewlayoutmanager.cpp +++ b/kpovmodeler/pmviewlayoutmanager.cpp @@ -866,12 +866,12 @@ void PMViewLayoutManager::removeLayout( const TQString& name ) } -PMSaveViewLayoutDialog::PMSaveViewLayoutDialog( PMShell* tqparent, +PMSaveViewLayoutDialog::PMSaveViewLayoutDialog( PMShell* parent, const char* name ) - : KDialogBase( tqparent, name, true, i18n( "Save View Layout" ), + : KDialogBase( parent, name, true, i18n( "Save View Layout" ), KDialogBase::Ok | KDialogBase::Cancel ) { - m_pShell = tqparent; + m_pShell = parent; setButtonOK( KStdGuiItem::save() ); enableButtonOK( false ); diff --git a/kpovmodeler/pmviewlayoutmanager.h b/kpovmodeler/pmviewlayoutmanager.h index 1ef04eba..c84147fb 100644 --- a/kpovmodeler/pmviewlayoutmanager.h +++ b/kpovmodeler/pmviewlayoutmanager.h @@ -293,7 +293,7 @@ class PMSaveViewLayoutDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - PMSaveViewLayoutDialog( PMShell* tqparent, const char* name = 0 ); + PMSaveViewLayoutDialog( PMShell* parent, const char* name = 0 ); ~PMSaveViewLayoutDialog( ); protected slots: virtual void slotOk( ); diff --git a/kpovmodeler/pmwarp.cpp b/kpovmodeler/pmwarp.cpp index b9e8682b..e97817bb 100644 --- a/kpovmodeler/pmwarp.cpp +++ b/kpovmodeler/pmwarp.cpp @@ -467,9 +467,9 @@ void PMWarp::setMajorRadius( const double c ) } } -PMDialogEditBase* PMWarp::editWidget( TQWidget* tqparent ) const +PMDialogEditBase* PMWarp::editWidget( TQWidget* parent ) const { - return new PMWarpEdit( tqparent ); + return new PMWarpEdit( parent ); } void PMWarp::restoreMemento( PMMemento* s ) diff --git a/kpovmodeler/pmwarp.h b/kpovmodeler/pmwarp.h index d58fab8f..15e86b65 100644 --- a/kpovmodeler/pmwarp.h +++ b/kpovmodeler/pmwarp.h @@ -68,7 +68,7 @@ public: /** * Returns a new @ref PMWarpEdit */ - 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/pmwarpedit.cpp b/kpovmodeler/pmwarpedit.cpp index f7afa539..64e327f2 100644 --- a/kpovmodeler/pmwarpedit.cpp +++ b/kpovmodeler/pmwarpedit.cpp @@ -29,8 +29,8 @@ #include <kdialog.h> -PMWarpEdit::PMWarpEdit( TQWidget* tqparent, const char* name ) - : Base( tqparent, name ) +PMWarpEdit::PMWarpEdit( TQWidget* parent, const char* name ) + : Base( parent, name ) { m_pDisplayedObject = 0; } diff --git a/kpovmodeler/pmwarpedit.h b/kpovmodeler/pmwarpedit.h index 653219b9..00becf67 100644 --- a/kpovmodeler/pmwarpedit.h +++ b/kpovmodeler/pmwarpedit.h @@ -44,9 +44,9 @@ class PMWarpEdit : public PMDialogEditBase typedef PMDialogEditBase Base; public: /** - * Creates a PMWarpEdit with tqparent and name + * Creates a PMWarpEdit with parent and name */ - PMWarpEdit( TQWidget* tqparent, const char* name = 0 ); + PMWarpEdit( TQWidget* parent, const char* name = 0 ); /** */ virtual void displayObject( PMObject* o ); diff --git a/kpovmodeler/pmxmlparser.cpp b/kpovmodeler/pmxmlparser.cpp index c82b6f4c..eb5d0123 100644 --- a/kpovmodeler/pmxmlparser.cpp +++ b/kpovmodeler/pmxmlparser.cpp @@ -117,7 +117,7 @@ void PMXMLParser::topParse( ) } } -void PMXMLParser::parseChildObjects( TQDomElement& e, PMObject* tqparent ) +void PMXMLParser::parseChildObjects( TQDomElement& e, PMObject* parent ) { TQDomNode c = e.firstChild( ); while( !c.isNull( ) ) @@ -132,7 +132,7 @@ void PMXMLParser::parseChildObjects( TQDomElement& e, PMObject* tqparent ) PMXMLHelper hlp( ce, m_pPart, this, m_majorDocumentFormat, m_minorDocumentFormat ); obj->readAttributes( hlp ); - if( insertChild( obj, tqparent ) ) + if( insertChild( obj, parent ) ) { parseChildObjects( ce, obj ); diff --git a/kpovmodeler/pmxmlparser.h b/kpovmodeler/pmxmlparser.h index d33ff434..2ff8f351 100644 --- a/kpovmodeler/pmxmlparser.h +++ b/kpovmodeler/pmxmlparser.h @@ -70,10 +70,10 @@ private: bool initDocument( ); /** - * Looks for child objects, parses them and appends them to the tqparent - * object. If tqparent is 0, all objects are appended to the result list. + * Looks for child objects, parses them and appends them to the parent + * object. If parent is 0, all objects are appended to the result list. */ - void parseChildObjects( TQDomElement& e, PMObject* tqparent ); + void parseChildObjects( TQDomElement& e, PMObject* parent ); TQDomDocument* m_pDoc; int m_majorDocumentFormat; diff --git a/kruler/klineal.cpp b/kruler/klineal.cpp index 426c6c24..896c8656 100644 --- a/kruler/klineal.cpp +++ b/kruler/klineal.cpp @@ -67,7 +67,7 @@ static const uchar cursorBits[] = { * create the thingy with no borders and set up * its members */ -KLineal::KLineal(TQWidget*tqparent,const char* name):KMainWindow(tqparent,name){ +KLineal::KLineal(TQWidget*parent,const char* name):KMainWindow(parent,name){ if (!name) { name = "klineal"; } diff --git a/kruler/klineal.h b/kruler/klineal.h index 0acdda1c..b59aa1ac 100644 --- a/kruler/klineal.h +++ b/kruler/klineal.h @@ -36,7 +36,7 @@ class KLineal : public KMainWindow { public: enum { North=0, West=1, South=2, East=3 }; /** constructor */ - KLineal(TQWidget*tqparent=0,const char* name=0); + KLineal(TQWidget*parent=0,const char* name=0); /** destructor */ ~KLineal(); void move(int x, int y); diff --git a/ksnapshot/ksnapshot.cpp b/ksnapshot/ksnapshot.cpp index e24b8ded..881f67a2 100644 --- a/ksnapshot/ksnapshot.cpp +++ b/ksnapshot/ksnapshot.cpp @@ -58,9 +58,9 @@ #define kApp KApplication::kApplication() -KSnapshot::KSnapshot(TQWidget *tqparent, const char *name, bool grabCurrent) +KSnapshot::KSnapshot(TQWidget *parent, const char *name, bool grabCurrent) : DCOPObject("interface"), - KDialogBase(tqparent, name, true, TQString(), Help|User1, User1, + KDialogBase(parent, name, true, TQString(), Help|User1, User1, true, KStdGuiItem::quit() ) { grabber = new TQWidget( 0, 0, WStyle_Customize | WX11BypassWM ); diff --git a/ksnapshot/ksnapshot.h b/ksnapshot/ksnapshot.h index 99f0d8c1..c0d5becc 100644 --- a/ksnapshot/ksnapshot.h +++ b/ksnapshot/ksnapshot.h @@ -26,8 +26,8 @@ class KSnapshotPreview : public TQLabel TQ_OBJECT public: - KSnapshotPreview(TQWidget *tqparent, const char *name = 0) - : TQLabel(tqparent, name) + KSnapshotPreview(TQWidget *parent, const char *name = 0) + : TQLabel(parent, name) { tqsetAlignment(AlignHCenter | AlignVCenter); setCursor(TQCursor(TQt::PointingHandCursor)); @@ -40,13 +40,13 @@ class KSnapshotPreview : public TQLabel // does unexpected things when painting directly onto the pixmap TQPixmap pixmap(pm); TQPixmap handle(15, 15); - TQBitmap tqmask(15, 15, true); + TQBitmap mask(15, 15, true); { - TQPainter p(&tqmask); + TQPainter p(&mask); tqstyle().tqdrawPrimitive(TQStyle::PE_SizeGrip, &p, TQRect(0, 0, 15, 15), tqpalette().active()); p.end(); - handle.setMask(tqmask); + handle.setMask(mask); } { @@ -95,7 +95,7 @@ class KSnapshot : public KDialogBase, virtual public KSnapshotIface TQ_OBJECT public: - KSnapshot(TQWidget *tqparent= 0, const char *name= 0, bool grabCurrent=false); + KSnapshot(TQWidget *parent= 0, const char *name= 0, bool grabCurrent=false); ~KSnapshot(); enum CaptureMode { FullScreen=0, WindowUnderCursor=1, Region=2, ChildWindow=3 }; diff --git a/ksnapshot/regiongrabber.cpp b/ksnapshot/regiongrabber.cpp index c14eb9b3..74ac960a 100644 --- a/ksnapshot/regiongrabber.cpp +++ b/ksnapshot/regiongrabber.cpp @@ -28,8 +28,8 @@ #include <kglobalsettings.h> -SizeTip::SizeTip( TQWidget *tqparent, const char *name ) - : TQLabel( tqparent, name, WStyle_Customize | WX11BypassWM | +SizeTip::SizeTip( TQWidget *parent, const char *name ) + : TQLabel( parent, name, WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop | WStyle_NoBorder | WStyle_Tool ) { setMargin( 2 ); diff --git a/ksnapshot/regiongrabber.h b/ksnapshot/regiongrabber.h index 1c9f4a3a..3cc1961e 100644 --- a/ksnapshot/regiongrabber.h +++ b/ksnapshot/regiongrabber.h @@ -28,7 +28,7 @@ class TQTimer; class SizeTip : public TQLabel { public: - SizeTip( TQWidget *tqparent, const char *name=0 ); + SizeTip( TQWidget *parent, const char *name=0 ); ~SizeTip() {} void setTip( const TQRect &rect ); diff --git a/ksnapshot/windowgrabber.cpp b/ksnapshot/windowgrabber.cpp index a468d7c5..189fb856 100644 --- a/ksnapshot/windowgrabber.cpp +++ b/ksnapshot/windowgrabber.cpp @@ -61,11 +61,11 @@ void getWindowsRecursive( std::vector<TQRect>& windows, Window w, windows.push_back( r ); } - Window root, tqparent; + Window root, parent; Window* tqchildren; unsigned int ntqchildren; - if( XQueryTree( qt_xdisplay(), w, &root, &tqparent, &tqchildren, &ntqchildren ) != 0 ) { + if( XQueryTree( qt_xdisplay(), w, &root, &parent, &tqchildren, &ntqchildren ) != 0 ) { for( unsigned int i = 0; i < ntqchildren; ++i ) { getWindowsRecursive( windows, tqchildren[ i ], x, y, depth + 1 ); } @@ -94,11 +94,11 @@ Window findRealWindow( Window w, int depth = 0 ) if( type != None ) return w; } - Window root, tqparent; + Window root, parent; Window* tqchildren; unsigned int ntqchildren; Window ret = None; - if( XQueryTree( qt_xdisplay(), w, &root, &tqparent, &tqchildren, &ntqchildren ) != 0 ) { + if( XQueryTree( qt_xdisplay(), w, &root, &parent, &tqchildren, &ntqchildren ) != 0 ) { for( unsigned int i = 0; i < ntqchildren && ret == None; ++i ) @@ -114,11 +114,11 @@ Window windowUnderCursor( bool includeDecorations = true ) { Window root; Window child; - uint tqmask; + uint mask; int rootX, rootY, winX, winY; XGrabServer( qt_xdisplay() ); XQueryPointer( qt_xdisplay(), qt_xrootwin(), &root, &child, - &rootX, &rootY, &winX, &winY, &tqmask ); + &rootX, &rootY, &winX, &winY, &mask ); if( child == None ) child = qt_xrootwin(); if( !includeDecorations ) { @@ -138,8 +138,8 @@ TQPixmap grabWindow( Window child, int x, int y, uint w, uint h, uint border ) int tmp1, tmp2; //Check whether the extension is available if ( XShapeQueryExtension( qt_xdisplay(), &tmp1, &tmp2 ) ) { - TQBitmap tqmask( w, h ); - //As the first step, get the tqmask from XShape. + TQBitmap mask( w, h ); + //As the first step, get the mask from XShape. int count, order; XRectangle* rects = XShapeGetRectangles( qt_xdisplay(), child, ShapeBounding, &count, &order ); @@ -148,7 +148,7 @@ TQPixmap grabWindow( Window child, int x, int y, uint w, uint h, uint border ) //Since the border area is part of the window, we use bounding // to limit our work region if (rects) { - //Create a TQRegion from the rectangles describing the bounding tqmask. + //Create a TQRegion from the rectangles describing the bounding mask. TQRegion contents; for ( int pos = 0; pos < count; pos++ ) contents += TQRegion( rects[pos].x, rects[pos].y, @@ -170,14 +170,14 @@ TQPixmap grabWindow( Window child, int x, int y, uint w, uint h, uint border ) TQRegion maskedAway = bbox - contents; TQMemArray<TQRect> maskedAwayRects = maskedAway.tqrects(); - //Construct a bitmap tqmask from the rectangles - TQPainter p(&tqmask); + //Construct a bitmap mask from the rectangles + TQPainter p(&mask); p.fillRect(0, 0, w, h, TQt::color1); for (uint pos = 0; pos < maskedAwayRects.count(); pos++) p.fillRect(maskedAwayRects[pos], TQt::color0); p.end(); - pm.setMask(tqmask); + pm.setMask(mask); } } #endif @@ -218,16 +218,16 @@ TQPixmap WindowGrabber::grabCurrent( bool includeDecorations ) XGrabServer( qt_xdisplay() ); Window child = windowUnderCursor( includeDecorations ); XGetGeometry( qt_xdisplay(), child, &root, &x, &y, &w, &h, &border, &depth ); - Window tqparent; + Window parent; Window* tqchildren; unsigned int ntqchildren; - if( XQueryTree( qt_xdisplay(), child, &root, &tqparent, + if( XQueryTree( qt_xdisplay(), child, &root, &parent, &tqchildren, &ntqchildren ) != 0 ) { if( tqchildren != NULL ) XFree( tqchildren ); int newx, newy; Window dummy; - if( XTranslateCoordinates( qt_xdisplay(), tqparent, qt_xrootwin(), + if( XTranslateCoordinates( qt_xdisplay(), parent, qt_xrootwin(), x, y, &newx, &newy, &dummy )) { x = newx; y = newy; diff --git a/ksvg/core/KSVGReader.cc b/ksvg/core/KSVGReader.cc index e5621010..6d142b1d 100644 --- a/ksvg/core/KSVGReader.cc +++ b/ksvg/core/KSVGReader.cc @@ -289,7 +289,7 @@ bool InputHandler::startElement(const TQString &namespaceURI, const TQString &, Helper::self()->doc()->appendChild(*newElement); // Special logics: - if(qName == "switch" || qName == "pattern" || qName == "tqmask") + if(qName == "switch" || qName == "pattern" || qName == "mask") m_noRendering = true; } @@ -320,10 +320,10 @@ bool InputHandler::startElement(const TQString &namespaceURI, const TQString &, if(!parentNode.isNull()) { - SVGElementImpl *tqparent = Helper::self()->doc()->getElementFromHandle(parentNode.handle()); + SVGElementImpl *parent = Helper::self()->doc()->getElementFromHandle(parentNode.handle()); - if(tqparent) - locatableParent = dynamic_cast<SVGLocatableImpl *>(tqparent); + if(parent) + locatableParent = dynamic_cast<SVGLocatableImpl *>(parent); } SVGMatrixImpl *parentMatrix = 0; @@ -392,7 +392,7 @@ bool InputHandler::endElement(const TQString &, const TQString &, const TQString } // Special logics: - if(qName == "switch" || qName == "pattern" || qName == "tqmask") + if(qName == "switch" || qName == "pattern" || qName == "mask") { m_noRendering = false; bool ok = tests ? tests->ok() : true; diff --git a/ksvg/data/SVGStylableImpl.lut.h b/ksvg/data/SVGStylableImpl.lut.h index 5e4f6520..77c6407c 100644 --- a/ksvg/data/SVGStylableImpl.lut.h +++ b/ksvg/data/SVGStylableImpl.lut.h @@ -47,7 +47,7 @@ static const char SVGStylableImpl__s_hashTableStrings[] = { "stroke\0" "clip\0" "fill\0" - "tqmask\0" + "mask\0" }; diff --git a/ksvg/dom/SVGLocatable.h b/ksvg/dom/SVGLocatable.h index fafe5204..f078b778 100644 --- a/ksvg/dom/SVGLocatable.h +++ b/ksvg/dom/SVGLocatable.h @@ -84,7 +84,7 @@ public: /** * Returns the transformation matrix from current user units (i.e., after application of - * the <code>transform</code> attribute, if any) to the tqparent user agent's notice of a "pixel". + * the <code>transform</code> attribute, if any) to the parent user agent's notice of a "pixel". * For display devices, ideally this represents a physical screen pixel. For other devices or * environments where physical pixel sizes are not known, then an algorithm similar to the * CSS2 definition of a "pixel" can be used instead. diff --git a/ksvg/dom/SVGSVGElement.h b/ksvg/dom/SVGSVGElement.h index 62196710..cdb0ef74 100644 --- a/ksvg/dom/SVGSVGElement.h +++ b/ksvg/dom/SVGSVGElement.h @@ -185,13 +185,13 @@ public: * corresponds to this 'svg' element. When the user agent is actually * rendering the content, then the position and size values represent the * actual values when rendering. The position and size values are unitless - * values in the coordinate system of the tqparent element. If no tqparent element + * values in the coordinate system of the parent element. If no parent element * exists (i.e., 'svg' element represents the root of the document tree), if * this SVG document is embedded as part of another document (e.g., via the * HTML 'object' element), then the position and size are unitless values in - * the coordinate system of the tqparent document. (If the tqparent uses CSS or + * the coordinate system of the parent document. (If the parent uses CSS or * XSL tqlayout, then unitless values represent pixel units for the current CSS - * or XSL viewport, as described in the CSS2 specification.) If the tqparent + * or XSL viewport, as described in the CSS2 specification.) If the parent * element does not have a coordinate system, then the user agent should * provide reasonable default values for this attribute. * diff --git a/ksvg/dom/SVGTextElement.h b/ksvg/dom/SVGTextElement.h index 1382d693..e4fb8a9f 100644 --- a/ksvg/dom/SVGTextElement.h +++ b/ksvg/dom/SVGTextElement.h @@ -61,7 +61,7 @@ class SVGTextElementImpl; * features that apply to tqshapes such as paths and rectangles also * apply to <code>text</code> elements. * - * It is possible to apply a gradient, pattern, clipping path, tqmask or + * It is possible to apply a gradient, pattern, clipping path, mask or * filter to text.When one of these facilities is applied to text and * keyword objectBoundingBox is used to specify a graphical effect * relative to the "object bounding box", then the object bounding box diff --git a/ksvg/ecma/ksvg_lookup.h b/ksvg/ecma/ksvg_lookup.h index ef22000a..11c41462 100644 --- a/ksvg/ecma/ksvg_lookup.h +++ b/ksvg/ecma/ksvg_lookup.h @@ -37,7 +37,7 @@ public: \ /* get() method, called by KSVGBridge::get */ \ KJS::Value get(KJS::ExecState *exec, const KJS::Identifier &propertyName, const KJS::ObjectImp* bridge) const; \ \ - /* Called by lookupGet(). Auto-generated. Forwards to the tqparent which has the given property. */ \ + /* Called by lookupGet(). Auto-generated. Forwards to the parent which has the given property. */ \ KJS::Value getInParents(KJS::ExecState *exec, const KJS::Identifier &propertyName, const KJS::ObjectImp* bridge) const; \ \ KJS::Object prototype(KJS::ExecState *exec) const;\ @@ -59,7 +59,7 @@ public: \ KSVG_GET_COMMON \ virtual KJS::Value cache(KJS::ExecState *exec) const; -// For classes without properties, but with a tqparent class to forward to +// For classes without properties, but with a parent class to forward to #define KSVG_FORWARDGET \ public: \ \ @@ -127,7 +127,7 @@ namespace KSVG * * This method does it all (looking in the hashtable, checking for function * overrides, creating the function or retrieving from cache, calling - * getValueProperty in case of a non-function property, forwarding to tqparent[s] if + * getValueProperty in case of a non-function property, forwarding to parent[s] if * unknown property). * * Template arguments: @@ -256,14 +256,14 @@ namespace KSVG } \ const KJS::ClassInfo ClassProto::info = { ClassName, 0, &s_hashTable, 0 }; \ -// same as KSVG_IMPLEMENT_PROTOTYPE but with a tqparent class to forward calls to +// same as KSVG_IMPLEMENT_PROTOTYPE but with a parent class to forward calls to // Not used within KSVG up to now - each class does a self proto lookup in generateddata.cpp #define KSVG_IMPLEMENT_PROTOTYPE_WITH_PARENT(ClassName,ClassProto,ClassFunc,ParentProto) \ KJS::Value KSVG::ClassProto::get(KJS::ExecState *exec, const KJS::Identifier &propertyName) const \ { \ KJS::Value val = lookupGetFunction<ClassFunc,KJS::ObjectImp>(exec, propertyName, &s_hashTable, this ); \ if ( val.type() != UndefinedType ) return val; \ - /* Not found -> forward request to "tqparent" prototype */ \ + /* Not found -> forward request to "parent" prototype */ \ return ParentProto::self(exec).get( exec, propertyName ); \ } \ bool KSVG::ClassProto::hasProperty(KJS::ExecState *exec, const KJS::Identifier &propertyName) const \ @@ -310,7 +310,7 @@ namespace KSVG // To be used in all call() implementations! // Can't use if (!thisObj.inherits(&ClassName::s_classInfo) since we don't -// use the (single-tqparent) inheritance of ClassInfo... +// use the (single-parent) inheritance of ClassInfo... #define KSVG_CHECK_THIS(ClassName) KSVG_CHECK(ClassName, thisObj) #endif diff --git a/ksvg/ecma/ksvg_window.cpp b/ksvg/ecma/ksvg_window.cpp index ae6024b3..90194781 100644 --- a/ksvg/ecma/ksvg_window.cpp +++ b/ksvg/ecma/ksvg_window.cpp @@ -490,7 +490,7 @@ void ScheduledAction::execute(Window *window) ////////////////////// WindowQObject //////////////////////// -WindowQObject::WindowQObject(Window *w) : tqparent(w) +WindowQObject::WindowQObject(Window *w) : parent(w) { } @@ -560,8 +560,8 @@ void WindowQObject::timerEvent(TQTimerEvent *e) scheduledActions.remove(it); } - if(tqparent->doc()) - action->execute(tqparent); + if(parent->doc()) + action->execute(parent); // It is important to test singleShot and not action->singleShot here - the // action could have been deleted already if not single shot and if the diff --git a/ksvg/ecma/ksvg_window.h b/ksvg/ecma/ksvg_window.h index 091448a8..ea07856c 100644 --- a/ksvg/ecma/ksvg_window.h +++ b/ksvg/ecma/ksvg_window.h @@ -114,7 +114,7 @@ protected slots: protected: void timerEvent(TQTimerEvent *e); private: - Window *tqparent; + Window *parent; //KHTMLPart *part; // not guarded, may be dangling TQMap<int, ScheduledAction*> scheduledActions; }; diff --git a/ksvg/impl/SVGEcma.cc b/ksvg/impl/SVGEcma.cc index 0ab19f3a..111b2887 100644 --- a/ksvg/impl/SVGEcma.cc +++ b/ksvg/impl/SVGEcma.cc @@ -150,13 +150,13 @@ void SVGDOMNodeBridge::putValueProperty(ExecState *exec, int token, const Value // triggered by one of the child nodes void updateTextItem(ExecState *exec, const DOM::Node node) { - DOM::Node tqparent; - while(!(tqparent = node.parentNode()).isNull()) + DOM::Node parent; + while(!(parent = node.parentNode()).isNull()) { - DOM::DOMString name = tqparent.nodeName(); + DOM::DOMString name = parent.nodeName(); if(name == "text" || name == "tspan" || name == "tref") { - SVGHelperImpl::updateItem(exec, tqparent); + SVGHelperImpl::updateItem(exec, parent); break; } } @@ -304,7 +304,7 @@ Value appendHelper(ExecState *exec, DOM::Node node, DOM::Node newNode) // Get some SVGElementImpl's SVGElementImpl *nodeElement = doc->getElementFromHandle(newNode.handle()); - // TODO : extra check needed to see if the new elements tqparent is already appended + // TODO : extra check needed to see if the new elements parent is already appended // in the doc. Not really nice, should be some other way? (Rob) if(nodeElement && !nodeElement->parentNode().parentNode().isNull()) { diff --git a/ksvg/impl/SVGElementImpl.cc b/ksvg/impl/SVGElementImpl.cc index 13fc9e46..deab7476 100644 --- a/ksvg/impl/SVGElementImpl.cc +++ b/ksvg/impl/SVGElementImpl.cc @@ -134,7 +134,7 @@ bool SVGElementImpl::hasEventListener(int id, bool local) if(local) return false; - // Check every tqparent element + // Check every parent element for(DOM::Node node = parentNode(); !node.isNull(); node = node.parentNode()) { SVGElementImpl *element = ownerDoc()->getElementFromHandle(node.handle()); @@ -518,7 +518,7 @@ bool SVGElementImpl::dispatchEvent(SVGEventImpl *evt, bool tempEvent) { evt->setTarget(this); - // Find out, where to send to -> collect tqparent nodes + // Find out, where to send to -> collect parent nodes TQPtrList<SVGElementImpl> nodeChain; for(DOM::Element e = *this; !e.isNull(); e = e.parentNode()) diff --git a/ksvg/impl/SVGMaskElementImpl.cc b/ksvg/impl/SVGMaskElementImpl.cc index afbc1e74..51c97be9 100644 --- a/ksvg/impl/SVGMaskElementImpl.cc +++ b/ksvg/impl/SVGMaskElementImpl.cc @@ -274,7 +274,7 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin SVGMatrixImpl *baseMatrix = SVGSVGElementImpl::createSVGMatrix(); - // Set the scale to map the tqmask onto the image + // Set the scale to map the mask onto the image double xScale = static_cast<double>(imageWidth) / width()->baseVal()->value(); double yScale = static_cast<double>(imageHeight) / height()->baseVal()->value(); @@ -338,13 +338,13 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin // Note: r and b reversed //TQImage maskImage(reinterpret_cast<unsigned char *>(imageBits), imageWidth, imageHeight, 32, 0, 0, TQImage::IgnoreEndian); //maskImage.setAlphaBuffer(true); - //maskImage.save("tqmask.png", "PNG"); + //maskImage.save("mask.png", "PNG"); } TQByteArray maskData(imageWidth * imageHeight); const double epsilon = DBL_EPSILON; - // Convert the rgba image into an 8-bit tqmask, according to the specs. + // Convert the rgba image into an 8-bit mask, according to the specs. for(int i = 0; i < imageWidth * imageHeight; i++) { TQ_UINT32 rgba = imageBits[i]; @@ -388,7 +388,7 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin baseMatrix->deref(); bbox->deref(); - // The screenToMask matrix is calculated each time the tqmask is used so we don't + // The screenToMask matrix is calculated each time the mask is used so we don't // need to set it here. TQWMatrix tempMatrix; @@ -414,19 +414,19 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin int imageWidth = static_cast<int>(width()->baseVal()->value() * xScale + 0.5); int imageHeight = static_cast<int>(height()->baseVal()->value() * yScale + 0.5); - Mask tqmask; + Mask mask; if(imageWidth > 0 && imageHeight > 0) { CacheKey key(referencingElement, imageWidth, imageHeight); - if(!m_maskCache.find(key, tqmask)) + if(!m_maskCache.find(key, mask)) { - tqmask = createMask(referencingElement, imageWidth, imageHeight); - m_maskCache.insert(key, tqmask, imageWidth * imageHeight); + mask = createMask(referencingElement, imageWidth, imageHeight); + m_maskCache.insert(key, mask, imageWidth * imageHeight); } - // Generate a tqmask-coordinates to screen-coordinates matrix + // Generate a mask-coordinates to screen-coordinates matrix SVGMatrixImpl *matrix = 0; if(locatableRef) matrix = locatableRef->getScreenCTM(); @@ -447,10 +447,10 @@ SVGMaskElementImpl::Mask SVGMaskElementImpl::createMask(SVGShapeImpl *referencin TQWMatrix screenToMask = matrix->qmatrix().invert(); matrix->deref(); - tqmask.setScreenToMask(screenToMask); + mask.setScreenToMask(screenToMask); } - return tqmask; + return mask; } TQByteArray SVGMaskElementImpl::maskRectangle(SVGShapeImpl *tqshape, const TQRect& screenRectangle) @@ -471,11 +471,11 @@ TQByteArray SVGMaskElementImpl::maskRectangle(SVGShapeImpl *tqshape, const TQRec if(maskElement) { - SVGMaskElementImpl::Mask tqmask = maskElement->createMask(tqshape); + SVGMaskElementImpl::Mask mask = maskElement->createMask(tqshape); - if(!tqmask.isEmpty()) + if(!mask.isEmpty()) { - TQByteArray maskData = tqmask.rectangle(screenRectangle); + TQByteArray maskData = mask.rectangle(screenRectangle); if(cumulativeMask.size() == 0) cumulativeMask = maskData; @@ -483,7 +483,7 @@ TQByteArray SVGMaskElementImpl::maskRectangle(SVGShapeImpl *tqshape, const TQRec { int size = cumulativeMask.size(); - // Multiply into the cumulative tqmask (using fast divide by 255) + // Multiply into the cumulative mask (using fast divide by 255) for(int i = 0; i < size; i++) { int tmp = maskData[i] * cumulativeMask[i] + 0x80; @@ -499,10 +499,10 @@ TQByteArray SVGMaskElementImpl::maskRectangle(SVGShapeImpl *tqshape, const TQRec if(!parentNode.isNull()) { - SVGElementImpl *tqparent = tqshape->ownerDoc()->getElementFromHandle(parentNode.handle()); + SVGElementImpl *parent = tqshape->ownerDoc()->getElementFromHandle(parentNode.handle()); - if(tqparent) - tqshape = dynamic_cast<SVGShapeImpl *>(tqparent); + if(parent) + tqshape = dynamic_cast<SVGShapeImpl *>(parent); else tqshape = 0; } @@ -514,8 +514,8 @@ TQByteArray SVGMaskElementImpl::maskRectangle(SVGShapeImpl *tqshape, const TQRec return cumulativeMask; } -SVGMaskElementImpl::Mask::Mask(const TQByteArray& tqmask, const TQWMatrix& screenToMask, int width, int height) - : m_width(width), m_height(height), m_tqmask(tqmask), m_screenToMask(screenToMask) +SVGMaskElementImpl::Mask::Mask(const TQByteArray& mask, const TQWMatrix& screenToMask, int width, int height) + : m_width(width), m_height(height), m_mask(mask), m_screenToMask(screenToMask) { } diff --git a/ksvg/impl/SVGMaskElementImpl.h b/ksvg/impl/SVGMaskElementImpl.h index 0e4f0f89..5b61d713 100644 --- a/ksvg/impl/SVGMaskElementImpl.h +++ b/ksvg/impl/SVGMaskElementImpl.h @@ -56,7 +56,7 @@ public: { public: Mask() : m_width(0), m_height(0) {} - Mask(const TQByteArray& tqmask, const TQWMatrix& screenToMask, int width, int height); + Mask(const TQByteArray& mask, const TQWMatrix& screenToMask, int width, int height); ~Mask() {} bool isEmpty() const { return m_width == 0; } @@ -68,7 +68,7 @@ public: private: int m_width; int m_height; - TQByteArray m_tqmask; + TQByteArray m_mask; TQWMatrix m_screenToMask; }; @@ -89,9 +89,9 @@ public: Mask createMask(SVGShapeImpl *referencingElement); - // Compute the tqmask on a given tqshape, taking into account all masks defined + // Compute the mask on a given tqshape, taking into account all masks defined // on the tqshape's ancestors. This is a workaround for us not having a buffer - // for container elements, so we can't tqmask containers directly. + // for container elements, so we can't mask containers directly. static TQByteArray maskRectangle(SVGShapeImpl *tqshape, const TQRect& screenRectangle); private: @@ -137,7 +137,7 @@ public: void putValueProperty(KJS::ExecState *exec, int token, const KJS::Value &value, int attr); }; -KSVG_REGISTER_ELEMENT(SVGMaskElementImpl, "tqmask") +KSVG_REGISTER_ELEMENT(SVGMaskElementImpl, "mask") inline unsigned char SVGMaskElementImpl::Mask::value(int screenX, int screenY) const { @@ -146,7 +146,7 @@ inline unsigned char SVGMaskElementImpl::Mask::value(int screenX, int screenY) c m_screenToMask.map(screenX, screenY, &x, &y); if(x >= 0 && x < m_width && y >= 0 && y < m_height) - return m_tqmask[x + y * m_width]; + return m_mask[x + y * m_width]; else return 0; } diff --git a/ksvg/impl/SVGSVGElementImpl.h b/ksvg/impl/SVGSVGElementImpl.h index b5d6212d..d2667a35 100644 --- a/ksvg/impl/SVGSVGElementImpl.h +++ b/ksvg/impl/SVGSVGElementImpl.h @@ -158,7 +158,7 @@ private: TQMap<TQString, SVGElementImpl *> m_map; - // Transformation provided by the 'tqparent' of the outermost svg element + // Transformation provided by the 'parent' of the outermost svg element SVGMatrixImpl *m_rootParentScreenCTM; SVGMatrixImpl *m_localMatrix; diff --git a/ksvg/impl/SVGShapeImpl.cc b/ksvg/impl/SVGShapeImpl.cc index 255ab286..755bbd13 100644 --- a/ksvg/impl/SVGShapeImpl.cc +++ b/ksvg/impl/SVGShapeImpl.cc @@ -59,9 +59,9 @@ SVGShapeImpl::~SVGShapeImpl() bool SVGShapeImpl::directRender() { - SVGShapeImpl *tqparent = dynamic_cast<SVGShapeImpl *>(ownerDoc()->getElementFromHandle(parentNode().handle())); - if(tqparent) - return tqparent->directRender(); + SVGShapeImpl *parent = dynamic_cast<SVGShapeImpl *>(ownerDoc()->getElementFromHandle(parentNode().handle())); + if(parent) + return parent->directRender(); else return true; } diff --git a/ksvg/impl/SVGStylableImpl.cc b/ksvg/impl/SVGStylableImpl.cc index 32db8575..d1019ff8 100644 --- a/ksvg/impl/SVGStylableImpl.cc +++ b/ksvg/impl/SVGStylableImpl.cc @@ -270,7 +270,7 @@ void SVGStylableImpl::processStyle() m_strokeOpacity = 1; } - // Fake group opacity by multiplying by our tqparent's group opacity + // Fake group opacity by multiplying by our parent's group opacity if(~m_flags & SVG_STYLE_FLAG_OPACITY) { if(parentStyle) @@ -286,7 +286,7 @@ void SVGStylableImpl::processStyle() m_clipPath = ""; if(~m_flags & SVG_STYLE_FLAG_MASK) - m_tqmask = ""; + m_mask = ""; // Spec: default "nonzero" if(~m_flags & SVG_STYLE_FLAG_FILL_RULE) @@ -737,7 +737,7 @@ float SVGStylableImpl::fontSizeForText(const TQString &value) glyph-orientation-vertical SVGStylableImpl::GlyphOrientationVertical DontDelete|ReadOnly glyph-orientation-horizontal SVGStylableImpl::GlyphOrientationHorizontal DontDelete|ReadOnly color-interpolation SVGStylableImpl::ColorInterpolation DontDelete|ReadOnly - tqmask SVGStylableImpl::Mask DontDelete|ReadOnly + mask SVGStylableImpl::Mask DontDelete|ReadOnly @end @namespace KSVG @begin SVGStylableImplProto::s_hashTable 2 @@ -1076,7 +1076,7 @@ void SVGStylableImpl::putValueProperty(ExecState *exec, int token, const Value & case Mask: m_flags |= SVG_STYLE_FLAG_MASK; if(!inherit) - m_tqmask = extractUrlId(param); + m_mask = extractUrlId(param); break; case MarkerStart: m_flags |= SVG_STYLE_FLAG_MARKER_START; diff --git a/ksvg/impl/SVGStylableImpl.h b/ksvg/impl/SVGStylableImpl.h index e2493317..34ce2f4e 100644 --- a/ksvg/impl/SVGStylableImpl.h +++ b/ksvg/impl/SVGStylableImpl.h @@ -225,7 +225,7 @@ public: STYLE_GET(TQString, WordSpacing, m_wordSpacing) STYLE_GET(TQString, FontWeight, m_fontWeight) STYLE_GET(TQString, ClipPath, m_clipPath) - STYLE_GET(TQString, Mask, m_tqmask) + STYLE_GET(TQString, Mask, m_mask) STYLE_GET(TQString, StartMarker, m_startMarker) STYLE_GET(TQString, MidMarker, m_midMarker) STYLE_GET(TQString, EndMarker, m_endMarker) @@ -255,7 +255,7 @@ public: STYLE_GET_OPTIM(EColorInterpolation, ColorInterpolation, m_colorInterpolation, 1) STYLE_HAS(ClipPath, m_clipPath) - STYLE_HAS(Mask, m_tqmask) + STYLE_HAS(Mask, m_mask) STYLE_HAS(StartMarker, m_startMarker) STYLE_HAS(MidMarker, m_midMarker) STYLE_HAS(EndMarker, m_endMarker) diff --git a/ksvg/impl/SVGTransformableImpl.cc b/ksvg/impl/SVGTransformableImpl.cc index 4776c679..59dd904b 100644 --- a/ksvg/impl/SVGTransformableImpl.cc +++ b/ksvg/impl/SVGTransformableImpl.cc @@ -87,8 +87,8 @@ SVGMatrixImpl *SVGTransformableImpl::getCTM() if(!parentNde.isNull() && parentNde.nodeType() != DOM::Node::DOCUMENT_NODE) { - SVGElementImpl *tqparent = element->ownerDoc()->getElementFromHandle(parentNde.handle()); - SVGLocatableImpl *locatableParent = dynamic_cast<SVGLocatableImpl *>(tqparent); + SVGElementImpl *parent = element->ownerDoc()->getElementFromHandle(parentNde.handle()); + SVGLocatableImpl *locatableParent = dynamic_cast<SVGLocatableImpl *>(parent); if(locatableParent) { diff --git a/ksvg/impl/SVGUseElementImpl.cc b/ksvg/impl/SVGUseElementImpl.cc index b7bc40f2..872bb0bc 100644 --- a/ksvg/impl/SVGUseElementImpl.cc +++ b/ksvg/impl/SVGUseElementImpl.cc @@ -243,10 +243,10 @@ void SVGUseElementImpl::createItem(KSVGCanvas *c) setReferencedElement(orig); - // Create a tqparent, a <g> - SVGElementImpl *tqparent = 0; + // Create a parent, a <g> + SVGElementImpl *parent = 0; DOM::Element impl = static_cast<DOM::Document *>(ownerDoc())->createElement("g"); - tqparent = SVGDocumentImpl::createElement("g", impl, ownerDoc()); + parent = SVGDocumentImpl::createElement("g", impl, ownerDoc()); SVGElementImpl *clone = orig->cloneNode(true); // Apply the use-correction @@ -258,8 +258,8 @@ void SVGUseElementImpl::createItem(KSVGCanvas *c) trans += ")"; // Apply the transform attribute and render the element - tqparent->setAttributeInternal("transform", trans); - tqparent->setAttribute("transform", trans); + parent->setAttributeInternal("transform", trans); + parent->setAttribute("transform", trans); // Apply width/height if symbol if(dynamic_cast<SVGSymbolElementImpl *>(clone)) @@ -294,14 +294,14 @@ void SVGUseElementImpl::createItem(KSVGCanvas *c) } } - appendChild(*tqparent); - tqparent->appendChild(*clone); + appendChild(*parent); + parent->appendChild(*clone); - setupSubtree(tqparent, ownerSVGElement(), viewportElement()); + setupSubtree(parent, ownerSVGElement(), viewportElement()); m_instanceRoot->setCorrespondingElement(clone); - dynamic_cast<SVGLocatableImpl *>(tqparent)->updateCachedScreenCTM(screenCTM()); + dynamic_cast<SVGLocatableImpl *>(parent)->updateCachedScreenCTM(screenCTM()); // Redirect local ecma event handlers to the correspondingElement TQPtrListIterator<SVGRegisteredEventListener> it(eventListeners()); diff --git a/ksvg/impl/generateddata.cpp b/ksvg/impl/generateddata.cpp index 16ac3456..5a4b3d7b 100644 --- a/ksvg/impl/generateddata.cpp +++ b/ksvg/impl/generateddata.cpp @@ -283,7 +283,7 @@ const ClassInfo SVGMPathElementImpl::s_classInfo = {"KSVG::SVGMPathElementImpl", const DOM::DOMString SVGMarkerElementImpl::s_tagName = "marker"; const ClassInfo SVGMarkerElementImpl::s_classInfo = {"KSVG::SVGMarkerElementImpl",0,&SVGMarkerElementImpl::s_hashTable,0}; const ClassInfo SVGMarkerElementImplConstructor::s_classInfo = {"KSVG::SVGMarkerElementImplConstructor",0,&SVGMarkerElementImplConstructor::s_hashTable,0}; -const DOM::DOMString SVGMaskElementImpl::s_tagName = "tqmask"; +const DOM::DOMString SVGMaskElementImpl::s_tagName = "mask"; const ClassInfo SVGMaskElementImpl::s_classInfo = {"KSVG::SVGMaskElementImpl",0,&SVGMaskElementImpl::s_hashTable,0}; const ClassInfo SVGMatrixImpl::s_classInfo = {"KSVG::SVGMatrixImpl",0,&SVGMatrixImpl::s_hashTable,0}; const ClassInfo SVGMetadataElementImpl::s_classInfo = {"KSVG::SVGMetadataElementImpl",0,0,0}; diff --git a/ksvg/impl/libs/art_support/art_misc.c b/ksvg/impl/libs/art_support/art_misc.c index bcf9ec46..69b45306 100644 --- a/ksvg/impl/libs/art_support/art_misc.c +++ b/ksvg/impl/libs/art_support/art_misc.c @@ -464,7 +464,7 @@ struct _ksvgArtRgbAffineClipAlphaData int src_width; int src_height; int src_rowstride; - const art_u8 *tqmask; + const art_u8 *mask; int y0; }; @@ -592,7 +592,7 @@ ksvg_art_rgb_affine_clip_callback (void *callback_data, int y, } static -void ksvg_art_rgb_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6], +void ksvg_art_rgb_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, int x1, int y, const double inv[6], int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height) { const art_u8 *src_p; @@ -626,7 +626,7 @@ void ksvg_art_rgb_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int srcAlpha = alpha * src_p[3] + 0x80; srcAlpha = (srcAlpha + (srcAlpha >> 8)) >> 8; - srcAlpha = (srcAlpha * *tqmask++) + 0x80; + srcAlpha = (srcAlpha * *mask++) + 0x80; srcAlpha = (srcAlpha + (srcAlpha >> 8)) >> 8; d = *dst_p; @@ -656,7 +656,7 @@ void ksvg_art_rgb_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int else { dst_p += 3; - tqmask++; + mask++; } } } @@ -680,7 +680,7 @@ ksvg_art_rgb_affine_clip_mask_callback (void *callback_data, int y, x1 = data->x1; alphatab = data->alphatab; - maskbuf = data->tqmask + (y - data->y0) * (x1 - x0); + maskbuf = data->mask + (y - data->y0) * (x1 - x0); if(n_steps > 0) { @@ -853,7 +853,7 @@ ksvg_art_rgba_affine_clip_callback (void *callback_data, int y, } static -void ksvg_art_rgba_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6], +void ksvg_art_rgba_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, int x1, int y, const double inv[6], int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height) { const art_u8 *src_p; @@ -887,7 +887,7 @@ void ksvg_art_rgba_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int srcAlpha = alpha * src_p[3] + 0x80; srcAlpha = (srcAlpha + (srcAlpha >> 8)) >> 8; - srcAlpha = (srcAlpha * *tqmask++) + 0x80; + srcAlpha = (srcAlpha * *mask++) + 0x80; srcAlpha = (srcAlpha + (srcAlpha >> 8)) >> 8; d = *dst_p; @@ -924,7 +924,7 @@ void ksvg_art_rgba_affine_clip_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int else { dst_p += 4; - tqmask++; + mask++; } } } @@ -948,7 +948,7 @@ ksvg_art_rgba_affine_clip_mask_callback (void *callback_data, int y, x1 = data->x1; alphatab = data->alphatab; - maskbuf = data->tqmask + (y - data->y0) * (x1 - x0); + maskbuf = data->mask + (y - data->y0) * (x1 - x0); if(n_steps > 0) { @@ -1030,7 +1030,7 @@ void ksvg_art_rgb_affine_clip(const ArtSVP *svp, art_u8 *dst, int x0, int y0, in const art_u8 *src, int src_width, int src_height, int src_rowstride, const double affine[6], - int alpha, const art_u8 *tqmask) + int alpha, const art_u8 *mask) { ksvgArtRgbAffineClipAlphaData data; int i; @@ -1052,7 +1052,7 @@ void ksvg_art_rgb_affine_clip(const ArtSVP *svp, art_u8 *dst, int x0, int y0, in data.x0 = x0; data.x1 = x1; data.y0 = y0; - data.tqmask = tqmask; + data.mask = mask; art_affine_invert(data.inv, affine); @@ -1063,14 +1063,14 @@ void ksvg_art_rgb_affine_clip(const ArtSVP *svp, art_u8 *dst, int x0, int y0, in if(dst_channels == 3) { - if(tqmask) + if(mask) art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_affine_clip_mask_callback, &data); else art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_affine_clip_callback, &data); } else { - if(tqmask) + if(mask) art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_affine_clip_mask_callback, &data); else art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgba_affine_clip_callback, &data); @@ -1228,7 +1228,7 @@ ksvg_art_rgb_texture_callback (void *callback_data, int y, } static -void ksvg_art_rgb_texture_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6], +void ksvg_art_rgb_texture_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, int x1, int y, const double inv[6], int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height) { const art_u8 *src_p; @@ -1277,11 +1277,11 @@ void ksvg_art_rgb_texture_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, /* Pattern source is in RGBA format, premultiplied. * alpha represents fill/stroke/group opacity. * - * Multiply source alpha by 'alpha' and tqmask value then composite over. - * For each channel, d = d + alpha * tqmask * (s - srcAlpha * d). + * Multiply source alpha by 'alpha' and mask value then composite over. + * For each channel, d = d + alpha * mask * (s - srcAlpha * d). */ - am = (alpha * *tqmask++) + 0x80; + am = (alpha * *mask++) + 0x80; am = (am + (am >> 8)) >> 8; srcAlpha = src_p[3]; @@ -1341,7 +1341,7 @@ ksvg_art_rgb_texture_mask_callback (void *callback_data, int y, alphatab = data->alphatab; - maskbuf = data->tqmask + (y - data->y0) * (x1 - x0); + maskbuf = data->mask + (y - data->y0) * (x1 - x0); if(n_steps > 0) { @@ -1545,7 +1545,7 @@ ksvg_art_rgba_texture_callback (void *callback_data, int y, } static -void ksvg_art_rgba_texture_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, int x1, int y, const double inv[6], +void ksvg_art_rgba_texture_mask_run(art_u8 *dst_p, const art_u8 *mask, int x0, int x1, int y, const double inv[6], int alpha, const art_u8 *src, int src_rowstride, int src_width, int src_height) { const art_u8 *src_p; @@ -1594,11 +1594,11 @@ void ksvg_art_rgba_texture_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, /* Pattern source is in RGBA format, premultiplied. * alpha represents fill/stroke/group opacity. * - * Multiply source alpha by 'alpha' and tqmask value then composite over. - * For each channel, d = d + alpha * tqmask * (s - srcAlpha * d). + * Multiply source alpha by 'alpha' and mask value then composite over. + * For each channel, d = d + alpha * mask * (s - srcAlpha * d). */ - am = (alpha * *tqmask++) + 0x80; + am = (alpha * *mask++) + 0x80; am = (am + (am >> 8)) >> 8; srcAlpha = src_p[3]; @@ -1636,7 +1636,7 @@ void ksvg_art_rgba_texture_mask_run(art_u8 *dst_p, const art_u8 *tqmask, int x0, *dst_p++ = d + tmp2; - /* dstAlpha = dstAlpha + srcAlpha * alpha * tqmask * (1 - dstAlpha) */ + /* dstAlpha = dstAlpha + srcAlpha * alpha * mask * (1 - dstAlpha) */ d = *dst_p; tmp = srcAlpha * am + 0x80; @@ -1670,7 +1670,7 @@ ksvg_art_rgba_texture_mask_callback (void *callback_data, int y, alphatab = data->alphatab; - maskbuf = data->tqmask + (y - data->y0) * (x1 - x0); + maskbuf = data->mask + (y - data->y0) * (x1 - x0); if(n_steps > 0) { @@ -1756,7 +1756,7 @@ void ksvg_art_rgb_texture(const ArtSVP *svp, art_u8 *dst, int x0, int y0, int x1 ArtFilterLevel level, ArtAlphaGamma *alphaGamma, int alpha, - const art_u8 *tqmask) + const art_u8 *mask) { ksvgArtRgbAffineClipAlphaData data; int i; @@ -1790,10 +1790,10 @@ void ksvg_art_rgb_texture(const ArtSVP *svp, art_u8 *dst, int x0, int y0, int x1 data.src_height = src_height; data.src_rowstride = src_rowstride; - data.tqmask = tqmask; + data.mask = mask; data.y0 = y0; - if(tqmask) + if(mask) { if(dst_channels == 3) art_svp_render_aa(svp, x0, y0, x1, y1, ksvg_art_rgb_texture_mask_callback, &data); diff --git a/ksvg/impl/libs/art_support/art_misc.h b/ksvg/impl/libs/art_support/art_misc.h index 7311d4b7..52f09a63 100644 --- a/ksvg/impl/libs/art_support/art_misc.h +++ b/ksvg/impl/libs/art_support/art_misc.h @@ -58,7 +58,7 @@ extern "C" { const art_u8 *src, int src_width, int src_height, int src_rowstride, const double affine[6], - int alpha, const art_u8 *tqmask); + int alpha, const art_u8 *mask); void ksvg_art_rgb_texture(const ArtSVP *svp, art_u8 *dst, int x0, int y0, int x1, int y1, int dst_rowstride, int dst_channels, @@ -68,7 +68,7 @@ extern "C" { ArtFilterLevel level, ArtAlphaGamma *alphaGamma, int alpha, - const art_u8 *tqmask); + const art_u8 *mask); void ksvg_art_svp_move(ArtSVP *svp, int dx, int dy); diff --git a/ksvg/impl/libs/art_support/art_rgba_svp.c b/ksvg/impl/libs/art_support/art_rgba_svp.c index 0c552c42..04ea81fc 100644 --- a/ksvg/impl/libs/art_support/art_rgba_svp.c +++ b/ksvg/impl/libs/art_support/art_rgba_svp.c @@ -37,7 +37,7 @@ struct _ArtKSVGRgbaSVPAlphaData { art_u8 r, g, b, alpha; art_u32 rgba; art_u8 *buf; - art_u8 *tqmask; + art_u8 *mask; int rowstride; int x0, x1; int y0; @@ -124,7 +124,7 @@ art_ksvg_rgba_run_alpha (art_u8 *buf, art_u8 r, art_u8 g, art_u8 b, int alpha, i } static void -art_ksvg_rgba_mask_run_alpha (art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n) +art_ksvg_rgba_mask_run_alpha (art_u8 *buf, art_u8 *mask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n) { int i; int v; @@ -136,7 +136,7 @@ art_ksvg_rgba_mask_run_alpha (art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, a for(i = 0; i < n; i++) { - am = (alpha * *tqmask++) + 0x80; + am = (alpha * *mask++) + 0x80; am = (am + (am >> 8)) >> 8; v = *buf; @@ -353,7 +353,7 @@ art_ksvg_rgba_svp_alpha_mask_callback(void *callback_data, int y, b = data->b; alphatab = data->alphatab; - maskbuf = data->tqmask + (y - data->y0) * (data->x1 - data->x0); + maskbuf = data->mask + (y - data->y0) * (data->x1 - data->x0); if(n_steps > 0) { @@ -436,7 +436,7 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp, art_u32 rgba, art_u8 *buf, int rowstride, ArtAlphaGamma *alphagamma, - art_u8 *tqmask) + art_u8 *mask) { ArtKSVGRgbaSVPAlphaData data; int r, g, b; @@ -454,7 +454,7 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp, data.b = b; data.alpha = alpha; data.rgba = rgba; - data.tqmask = tqmask; + data.mask = mask; a = 0x8000; da = (alpha * 66051 + 0x80) >> 8; /* 66051 equals 2 ^ 32 / (255 * 255) */ @@ -471,7 +471,7 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp, data.x1 = x1; data.y0 = y0; - if(tqmask) + if(mask) art_svp_render_aa (svp, x0, y0, x1, y1, art_ksvg_rgba_svp_alpha_mask_callback, &data); else { @@ -485,7 +485,7 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp, /* RGB renderers */ static void -art_ksvg_rgb_mask_run_alpha(art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n) +art_ksvg_rgb_mask_run_alpha(art_u8 *buf, art_u8 *mask, art_u8 r, art_u8 g, art_u8 b, int alpha, int n) { int i; int v; @@ -497,7 +497,7 @@ art_ksvg_rgb_mask_run_alpha(art_u8 *buf, art_u8 *tqmask, art_u8 r, art_u8 g, art for(i = 0; i < n; i++) { - am = (alpha * *tqmask++) + 0x80; + am = (alpha * *mask++) + 0x80; am = (am + (am >> 8)) >> 8; v = *buf; @@ -538,7 +538,7 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y, b = data->b; alphatab = data->alphatab; - maskbuf = data->tqmask + (y - data->y0) * (data->x1 - data->x0); + maskbuf = data->mask + (y - data->y0) * (data->x1 - data->x0); if(n_steps > 0) { @@ -616,12 +616,12 @@ art_ksvg_rgb_svp_alpha_mask_callback(void *callback_data, int y, * @alphagamma is NULL. **/ void -art_ksvg_rgb_svp_alpha_tqmask(const ArtSVP *svp, +art_ksvg_rgb_svp_alpha_mask(const ArtSVP *svp, int x0, int y0, int x1, int y1, art_u32 rgba, art_u8 *buf, int rowstride, ArtAlphaGamma *alphagamma, - art_u8 *tqmask) + art_u8 *mask) { ArtKSVGRgbaSVPAlphaData data; int r, g, b, alpha; @@ -637,7 +637,7 @@ art_ksvg_rgb_svp_alpha_tqmask(const ArtSVP *svp, data.g = g; data.b = b; data.alpha = alpha; - data.tqmask = tqmask; + data.mask = mask; a = 0x8000; da = (alpha * 66051 + 0x80) >> 8; /* 66051 equals 2 ^ 32 / (255 * 255) */ diff --git a/ksvg/impl/libs/art_support/art_rgba_svp.h b/ksvg/impl/libs/art_support/art_rgba_svp.h index 860eabcc..b59096d4 100644 --- a/ksvg/impl/libs/art_support/art_rgba_svp.h +++ b/ksvg/impl/libs/art_support/art_rgba_svp.h @@ -40,15 +40,15 @@ art_ksvg_rgba_svp_alpha(const ArtSVP *svp, art_u32 rgba, art_u8 *buf, int rowstride, ArtAlphaGamma *alphagamma, - art_u8 *tqmask); + art_u8 *mask); void -art_ksvg_rgb_svp_alpha_tqmask(const ArtSVP *svp, +art_ksvg_rgb_svp_alpha_mask(const ArtSVP *svp, int x0, int y0, int x1, int y1, art_u32 rgba, art_u8 *buf, int rowstride, ArtAlphaGamma *alphagamma, - art_u8 *tqmask); + art_u8 *mask); #ifdef __cplusplus } diff --git a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c index 522480f1..70c00262 100644 --- a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c +++ b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib-drawable.c @@ -1103,7 +1103,7 @@ xlib_window_is_viewable (Window w) XWindowAttributes wa; while (w != 0) { - Window tqparent, root, *tqchildren; + Window parent, root, *tqchildren; int ntqchildren; XGetWindowAttributes (gdk_pixbuf_dpy, w, &wa); @@ -1111,16 +1111,16 @@ xlib_window_is_viewable (Window w) return 0; if (!XQueryTree (gdk_pixbuf_dpy, w, &root, - &tqparent, &tqchildren, &ntqchildren)) + &parent, &tqchildren, &ntqchildren)) return 0; if (ntqchildren > 0) XFree (tqchildren); - if (tqparent == root) + if (parent == root) return 1; - w = tqparent; + w = parent; } return 0; diff --git a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h index 7d359b61..aa94c7c6 100644 --- a/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h +++ b/ksvg/impl/libs/xrgbrender/gdk-pixbuf-xlib.h @@ -61,7 +61,7 @@ void gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf, XlibRgbDither dither, int x_dither, int y_dither); -void gdk_pixbuf_xlib_render_pixmap_and_tqmask (GdkPixbuf *pixbuf, +void gdk_pixbuf_xlib_render_pixmap_and_mask (GdkPixbuf *pixbuf, Pixmap *pixmap_return, Pixmap *mask_return, int alpha_threshold); diff --git a/ksvg/plugin/backends/agg/AggCanvasFactory.h b/ksvg/plugin/backends/agg/AggCanvasFactory.h index 92ba5b69..d075d688 100644 --- a/ksvg/plugin/backends/agg/AggCanvasFactory.h +++ b/ksvg/plugin/backends/agg/AggCanvasFactory.h @@ -35,7 +35,7 @@ public: AggCanvasFactory(); virtual ~AggCanvasFactory(); - virtual TQObject *createObject(TQObject *tqparent = 0, const char *pname = 0, const char *name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); + virtual TQObject *createObject(TQObject *parent = 0, const char *pname = 0, const char *name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); }; }; diff --git a/ksvg/plugin/backends/libart/LibartCanvas.cpp b/ksvg/plugin/backends/libart/LibartCanvas.cpp index 8688c28d..1d2ee30c 100644 --- a/ksvg/plugin/backends/libart/LibartCanvas.cpp +++ b/ksvg/plugin/backends/libart/LibartCanvas.cpp @@ -214,12 +214,12 @@ void LibartCanvas::drawImage(TQImage image, SVGStylableImpl *style, const SVGMat TQRect screenBBox(x0, y0, x1 - x0 + 1, y1 - y0 + 1); - TQByteArray tqmask = SVGMaskElementImpl::maskRectangle(tqshape, screenBBox); + TQByteArray mask = SVGMaskElementImpl::maskRectangle(tqshape, screenBBox); double affine[6]; KSVGHelper::matrixToAffine(matrix, affine); - ksvg_art_rgb_affine_clip(clipSvp, m_buffer + x0 * nrChannels() + y0 * rowStride(), x0, y0, x1 + 1, y1 + 1, rowStride(), nrChannels(), image.bits(), image.width(), image.height(), image.width() * 4, affine, int(style->getOpacity() * 255), (const art_u8 *)tqmask.data()); + ksvg_art_rgb_affine_clip(clipSvp, m_buffer + x0 * nrChannels() + y0 * rowStride(), x0, y0, x1 + 1, y1 + 1, rowStride(), nrChannels(), image.bits(), image.width(), image.height(), image.width() * 4, affine, int(style->getOpacity() * 255), (const art_u8 *)mask.data()); } art_svp_free(imageBorder); @@ -334,11 +334,11 @@ ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *tqshape) if(!parentNode.isNull()) { - SVGElementImpl *tqparent = element->ownerDoc()->getElementFromHandle(parentNode.handle()); + SVGElementImpl *parent = element->ownerDoc()->getElementFromHandle(parentNode.handle()); - if(tqparent) + if(parent) { - SVGShapeImpl *parentShape = dynamic_cast<SVGShapeImpl *>(tqparent); + SVGShapeImpl *parentShape = dynamic_cast<SVGShapeImpl *>(parent); if(parentShape) { @@ -354,7 +354,7 @@ ArtSVP *LibartCanvas::clipSingleSVP(ArtSVP *svp, SVGShapeImpl *tqshape) return clippedSvp; } -void LibartCanvas::drawSVP(ArtSVP *svp, art_u32 color, TQByteArray tqmask, TQRect screenBBox) +void LibartCanvas::drawSVP(ArtSVP *svp, art_u32 color, TQByteArray mask, TQRect screenBBox) { int x0 = screenBBox.left(); int y0 = screenBBox.top(); @@ -363,13 +363,13 @@ void LibartCanvas::drawSVP(ArtSVP *svp, art_u32 color, TQByteArray tqmask, TQRec if(m_nrChannels == 3) { - if(tqmask.data()) - art_ksvg_rgb_svp_alpha_tqmask(svp, x0, y0, x1 + 1, y1 + 1, color, m_buffer + x0 * 3 + y0 * 3 * m_width, m_width * 3, 0, (art_u8 *)tqmask.data()); + if(mask.data()) + art_ksvg_rgb_svp_alpha_mask(svp, x0, y0, x1 + 1, y1 + 1, color, m_buffer + x0 * 3 + y0 * 3 * m_width, m_width * 3, 0, (art_u8 *)mask.data()); else art_rgb_svp_alpha(svp, x0, y0, x1 + 1, y1 + 1, color, m_buffer + x0 * 3 + y0 * 3 * m_width, m_width * 3, 0); } else - art_ksvg_rgba_svp_alpha(svp, x0, y0, x1 + 1, y1 + 1, color, m_buffer + x0 * 4 + y0 * 4 * m_width, m_width * 4, 0, (art_u8 *)tqmask.data()); + art_ksvg_rgba_svp_alpha(svp, x0, y0, x1 + 1, y1 + 1, color, m_buffer + x0 * 4 + y0 * 4 * m_width, m_width * 4, 0, (art_u8 *)mask.data()); } ArtSVP *LibartCanvas::copy_svp(const ArtSVP *svp) diff --git a/ksvg/plugin/backends/libart/LibartCanvas.h b/ksvg/plugin/backends/libart/LibartCanvas.h index ff3829bd..9232789a 100644 --- a/ksvg/plugin/backends/libart/LibartCanvas.h +++ b/ksvg/plugin/backends/libart/LibartCanvas.h @@ -50,7 +50,7 @@ class LibartCanvas : public KSVGCanvas public: LibartCanvas(unsigned int width, unsigned int height); - void drawSVP(_ArtSVP *svp, art_u32 color, TQByteArray tqmask, TQRect screenBBox); + void drawSVP(_ArtSVP *svp, art_u32 color, TQByteArray mask, TQRect screenBBox); void drawImage(TQImage image, SVGStylableImpl *style, const SVGMatrixImpl *matrix, const KSVGPolygon& clippingPolygon); virtual T2P::BezierPath *toBezierPath(CanvasItem *item) const; diff --git a/ksvg/plugin/backends/libart/LibartCanvasFactory.h b/ksvg/plugin/backends/libart/LibartCanvasFactory.h index 0e5e3bed..c26aa833 100644 --- a/ksvg/plugin/backends/libart/LibartCanvasFactory.h +++ b/ksvg/plugin/backends/libart/LibartCanvasFactory.h @@ -35,7 +35,7 @@ public: LibartCanvasFactory(); virtual ~LibartCanvasFactory(); - virtual TQObject *createObject(TQObject *tqparent = 0, const char *pname = 0, const char *name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); + virtual TQObject *createObject(TQObject *parent = 0, const char *pname = 0, const char *name = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); }; } diff --git a/ksvg/plugin/backends/libart/LibartCanvasItems.cpp b/ksvg/plugin/backends/libart/LibartCanvasItems.cpp index c9042b56..1434931b 100644 --- a/ksvg/plugin/backends/libart/LibartCanvasItems.cpp +++ b/ksvg/plugin/backends/libart/LibartCanvasItems.cpp @@ -252,7 +252,7 @@ void LibartPainter::draw(LibartCanvas *canvas, _ArtSVP *svp, SVGStylableImpl *st TQRect screenBBox(x0, y0, x1 - x0 + 1, y1 - y0 + 1); - TQByteArray tqmask = SVGMaskElementImpl::maskRectangle(tqshape, screenBBox); + TQByteArray mask = SVGMaskElementImpl::maskRectangle(tqshape, screenBBox); if(paintType(style) == SVG_PAINTTYPE_URI) { @@ -263,11 +263,11 @@ void LibartPainter::draw(LibartCanvas *canvas, _ArtSVP *svp, SVGStylableImpl *st pserver->setBBoxTarget(tqshape); if(!pserver->finalized()) pserver->finalizePaintServer(); - pserver->render(canvas, clippedSvp, opacity(style), tqmask, screenBBox); + pserver->render(canvas, clippedSvp, opacity(style), mask, screenBBox); } } else - canvas->drawSVP(clippedSvp, m_color, tqmask, screenBBox); + canvas->drawSVP(clippedSvp, m_color, mask, screenBBox); } art_svp_free(clippedSvp); @@ -1899,7 +1899,7 @@ void LibartGradient::reference(const TQString &) { } -void LibartLinearGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArray tqmask, TQRect screenBBox) +void LibartLinearGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArray mask, TQRect screenBBox) { if(!m_stops.isEmpty()) { @@ -2022,9 +2022,9 @@ void LibartLinearGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQB art_render_svp(render, svp); art_ksvg_render_gradient_linear(render, linear, ART_FILTER_HYPER); - if(tqmask.data()) + if(mask.data()) art_render_mask(render, screenBBox.left(), screenBBox.top(), screenBBox.right() + 1, screenBBox.bottom() + 1, - (const art_u8 *)tqmask.data(), screenBBox.width()); + (const art_u8 *)mask.data(), screenBBox.width()); art_render_invoke(render); @@ -2032,7 +2032,7 @@ void LibartLinearGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQB } } -void LibartRadialGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArray tqmask, TQRect screenBBox) +void LibartRadialGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArray mask, TQRect screenBBox) { if(!m_stops.isEmpty()) { @@ -2158,9 +2158,9 @@ void LibartRadialGradient::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQB art_render_svp(render, svp); art_ksvg_render_gradient_radial(render, radial, ART_FILTER_HYPER); - if(tqmask.data()) + if(mask.data()) art_render_mask(render, screenBBox.left(), screenBBox.top(), screenBBox.right() + 1, screenBBox.bottom() + 1, - (const art_u8 *)tqmask.data(), screenBBox.width()); + (const art_u8 *)mask.data(), screenBBox.width()); art_render_invoke(render); @@ -2184,7 +2184,7 @@ void LibartPattern::reference(const TQString &href) m_pattern->reference(href); } -void LibartPattern::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArray tqmask, TQRect screenBBox) +void LibartPattern::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArray mask, TQRect screenBBox) { SVGPatternElementImpl::Tile tile = m_pattern->createTile(getBBoxTarget()); @@ -2202,7 +2202,7 @@ void LibartPattern::render(KSVGCanvas *c, ArtSVP *svp, float opacity, TQByteArra int alpha = int(opacity * 255 + 0.5); - ksvg_art_rgb_texture(svp, c->renderingBuffer() + screenBBox.x() * c->nrChannels() + screenBBox.y() * c->rowStride(), screenBBox.left(), screenBBox.top(), screenBBox.right() + 1, screenBBox.bottom() + 1, c->rowStride(), c->nrChannels(), tile.image().bits(), tile.image().width(), tile.image().height(), tile.image().width() * 4, affine, ART_FILTER_NEAREST, 0L, alpha, (art_u8 *)tqmask.data()); + ksvg_art_rgb_texture(svp, c->renderingBuffer() + screenBBox.x() * c->nrChannels() + screenBBox.y() * c->rowStride(), screenBBox.left(), screenBBox.top(), screenBBox.right() + 1, screenBBox.bottom() + 1, c->rowStride(), c->nrChannels(), tile.image().bits(), tile.image().width(), tile.image().height(), tile.image().width() * 4, affine, ART_FILTER_NEAREST, 0L, alpha, (art_u8 *)mask.data()); } } diff --git a/ksvg/plugin/backends/libart/LibartCanvasItems.h b/ksvg/plugin/backends/libart/LibartCanvasItems.h index bf18dbd0..b5b9984b 100644 --- a/ksvg/plugin/backends/libart/LibartCanvasItems.h +++ b/ksvg/plugin/backends/libart/LibartCanvasItems.h @@ -73,7 +73,7 @@ namespace KSVG LibartPaintServer() : CanvasPaintServer() {} virtual ~LibartPaintServer() {} - virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray tqmask, TQRect screenBBox) = 0; + virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray mask, TQRect screenBBox) = 0; _ArtRender *createRenderer(TQRect rect, KSVGCanvas *c); }; @@ -99,7 +99,7 @@ namespace KSVG public: LibartLinearGradient(SVGLinearGradientElementImpl *linear) : LibartGradient(linear), m_linear(linear) {} - virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray tqmask, TQRect screenBBox); + virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray mask, TQRect screenBBox); protected: SVGLinearGradientElementImpl *m_linear; @@ -110,7 +110,7 @@ namespace KSVG public: LibartRadialGradient(SVGRadialGradientElementImpl *radial) : LibartGradient(radial), m_radial(radial) {} - virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray tqmask, TQRect screenBBox); + virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray mask, TQRect screenBBox); protected: SVGRadialGradientElementImpl *m_radial; @@ -125,7 +125,7 @@ namespace KSVG virtual void finalizePaintServer(); virtual void reference(const TQString &href); - virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray tqmask, TQRect screenBBox); + virtual void render(KSVGCanvas *c, _ArtSVP *svp, float opacity, TQByteArray mask, TQRect screenBBox); protected: SVGPatternElementImpl *m_pattern; diff --git a/ksvg/plugin/ksvg_factory.cpp b/ksvg/plugin/ksvg_factory.cpp index 0f55be71..d5e5e1dc 100644 --- a/ksvg/plugin/ksvg_factory.cpp +++ b/ksvg/plugin/ksvg_factory.cpp @@ -43,7 +43,7 @@ extern "C" KInstance *KSVGPluginFactory::s_instance = 0; KAboutData *KSVGPluginFactory::s_about = 0; -KSVGPluginFactory::KSVGPluginFactory(TQObject *tqparent, const char *name) : KParts::Factory(tqparent, name) +KSVGPluginFactory::KSVGPluginFactory(TQObject *parent, const char *name) : KParts::Factory(parent, name) { } @@ -56,7 +56,7 @@ KSVGPluginFactory::~KSVGPluginFactory() s_about = 0; } -KParts::Part *KSVGPluginFactory::createPartObject(TQWidget *parentWidget, const char *wname, TQObject *tqparent, const char *name, const char *, const TQStringList &args) +KParts::Part *KSVGPluginFactory::createPartObject(TQWidget *parentWidget, const char *wname, TQObject *parent, const char *name, const char *, const TQStringList &args) { // Get the width and height of the <embed> // TODO : <object> @@ -72,7 +72,7 @@ KParts::Part *KSVGPluginFactory::createPartObject(TQWidget *parentWidget, const height = r2.cap(3).toUInt(&dummy); } - return new KSVGPlugin(parentWidget, wname, tqparent, name, width, height); + return new KSVGPlugin(parentWidget, wname, parent, name, width, height); } KInstance *KSVGPluginFactory::instance() @@ -90,8 +90,8 @@ KInstance *KSVGPluginFactory::instance() return s_instance; } -KSVGPluginBrowserExtension::KSVGPluginBrowserExtension(KSVGPlugin *tqparent) -: KParts::BrowserExtension(tqparent, "KSVGPlugin BrowserExtension") +KSVGPluginBrowserExtension::KSVGPluginBrowserExtension(KSVGPlugin *parent) +: KParts::BrowserExtension(parent, "KSVGPlugin BrowserExtension") { } diff --git a/ksvg/plugin/ksvg_factory.h b/ksvg/plugin/ksvg_factory.h index c94de0a1..846bf15f 100644 --- a/ksvg/plugin/ksvg_factory.h +++ b/ksvg/plugin/ksvg_factory.h @@ -32,10 +32,10 @@ class KSVGPluginFactory : public KParts::Factory Q_OBJECT TQ_OBJECT public: - KSVGPluginFactory(TQObject *tqparent = 0, const char *name = 0); + KSVGPluginFactory(TQObject *parent = 0, const char *name = 0); virtual ~KSVGPluginFactory(); - virtual KParts::Part *createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *tqparent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList()); + virtual KParts::Part *createPartObject(TQWidget *parentWidget = 0, const char *widgetName = 0, TQObject *parent = 0, const char *name = 0, const char *classname = "KParts::Part", const TQStringList &args = TQStringList()); static KInstance *instance(); @@ -51,7 +51,7 @@ Q_OBJECT friend class KSVGPlugin; public: - KSVGPluginBrowserExtension(KSVGPlugin *tqparent); + KSVGPluginBrowserExtension(KSVGPlugin *parent); virtual ~KSVGPluginBrowserExtension(); }; diff --git a/ksvg/plugin/ksvg_plugin.cpp b/ksvg/plugin/ksvg_plugin.cpp index 87cd7398..1a2e3f8d 100644 --- a/ksvg/plugin/ksvg_plugin.cpp +++ b/ksvg/plugin/ksvg_plugin.cpp @@ -81,7 +81,7 @@ struct KSVGPlugin::Private unsigned int height; }; -KSVGPlugin::KSVGPlugin(TQWidget *wtqparent, const char *, TQObject *tqparent, const char *name, unsigned int width, unsigned int height) : KParts::ReadOnlyPart(tqparent, name) +KSVGPlugin::KSVGPlugin(TQWidget *wparent, const char *, TQObject *parent, const char *name, unsigned int width, unsigned int height) : KParts::ReadOnlyPart(parent, name) { kdDebug(26003) << "KSVGPlugin::KSVGPlugin" << endl; setInstance(KSVGPluginFactory::instance()); @@ -95,7 +95,7 @@ KSVGPlugin::KSVGPlugin(TQWidget *wtqparent, const char *, TQObject *tqparent, co ksvgd->doc = 0; - ksvgd->window = new KSVGWidget(this, wtqparent, "Rendering Widget"); + ksvgd->window = new KSVGWidget(this, wparent, "Rendering Widget"); connect(ksvgd->window, TQT_SIGNAL(browseURL(const TQString &)), this, TQT_SLOT(browseURL(const TQString &))); ksvgd->window->show(); @@ -144,7 +144,7 @@ KSVGPlugin::KSVGPlugin(TQWidget *wtqparent, const char *, TQObject *tqparent, co ksvgd->renderingBackendAction->setItems(items); ksvgd->renderingBackendAction->setCurrentItem(KSVG::CanvasFactory::self()->itemInList(ksvgd->canvas)); - ksvgd->aboutKSVG = new KAboutApplication(KSVGPluginFactory::instance()->aboutData(), wtqparent); + ksvgd->aboutKSVG = new KAboutApplication(KSVGPluginFactory::instance()->aboutData(), wparent); setXMLFile("ksvgplugin.rc"); } diff --git a/ksvg/plugin/ksvg_plugin.h b/ksvg/plugin/ksvg_plugin.h index 919b0290..675f469d 100644 --- a/ksvg/plugin/ksvg_plugin.h +++ b/ksvg/plugin/ksvg_plugin.h @@ -37,7 +37,7 @@ class KSVGPlugin : public KParts::ReadOnlyPart Q_OBJECT TQ_OBJECT public: - KSVGPlugin(TQWidget *parentWidget, const char *wname, TQObject *tqparent, const char *name, unsigned int width = 0, unsigned int height = 0); + KSVGPlugin(TQWidget *parentWidget, const char *wname, TQObject *parent, const char *name, unsigned int width = 0, unsigned int height = 0); virtual ~KSVGPlugin(); virtual bool openFile() { return false; } diff --git a/ksvg/plugin/ksvg_widget.cpp b/ksvg/plugin/ksvg_widget.cpp index 8cfb4baa..015d7bad 100644 --- a/ksvg/plugin/ksvg_widget.cpp +++ b/ksvg/plugin/ksvg_widget.cpp @@ -27,8 +27,8 @@ #include "SVGDocumentImpl.h" #include "SVGSVGElementImpl.h" -KSVGWidget::KSVGWidget(KSVGPlugin *part, TQWidget *tqparent, const char *name) -: TQWidget(tqparent, name), m_part(part) +KSVGWidget::KSVGWidget(KSVGPlugin *part, TQWidget *parent, const char *name) +: TQWidget(parent, name), m_part(part) { setMouseTracking(true); setFocusPolicy(TQ_WheelFocus); diff --git a/ksvg/plugin/ksvg_widget.h b/ksvg/plugin/ksvg_widget.h index 33fc82e3..d84701c9 100644 --- a/ksvg/plugin/ksvg_widget.h +++ b/ksvg/plugin/ksvg_widget.h @@ -33,7 +33,7 @@ class KSVGWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - KSVGWidget(KSVGPlugin *part, TQWidget *tqparent, const char *name); + KSVGWidget(KSVGPlugin *part, TQWidget *parent, const char *name); virtual ~KSVGWidget(); KSVGPlugin *part() const; diff --git a/ksvg/test/W3C_TESTSUITE_1.1 b/ksvg/test/W3C_TESTSUITE_1.1 index a695c8d4..226c04c3 100644 --- a/ksvg/test/W3C_TESTSUITE_1.1 +++ b/ksvg/test/W3C_TESTSUITE_1.1 @@ -103,7 +103,7 @@ linking-uri-02-b - linking-uri-03-t x [MASKING] -masking-tqmask-01-b - +masking-mask-01-b - masking-opacity-01-b o masking-path-01-b x masking-path-02-b x diff --git a/ksvg/test/ZVON-TEST-PASSED b/ksvg/test/ZVON-TEST-PASSED index 476b0afc..c83c567e 100644 --- a/ksvg/test/ZVON-TEST-PASSED +++ b/ksvg/test/ZVON-TEST-PASSED @@ -86,8 +86,8 @@ masking-clipPath-BE-02.svg: x masking-clipPath-BE-08.svg: x masking-clipRule-BE-03.svg: x masking-groupOpac-BE-04.svg: x -masking-tqmask-BE-05.svg: x -masking-tqmask-BE-06.svg: x +masking-mask-BE-05.svg: x +masking-mask-BE-06.svg: x masking-property-BE-07.svg: x masking-vportClip-BE-09.svg: x diff --git a/kuickshow/src/aboutwidget.cpp b/kuickshow/src/aboutwidget.cpp index 94431005..79689a5b 100644 --- a/kuickshow/src/aboutwidget.cpp +++ b/kuickshow/src/aboutwidget.cpp @@ -31,8 +31,8 @@ #include "aboutwidget.h" -AboutWidget::AboutWidget( TQWidget *tqparent, const char *name ) - : TQVBox( tqparent, name, TQt::WShowModal ) +AboutWidget::AboutWidget( TQWidget *parent, const char *name ) + : TQVBox( parent, name, TQt::WShowModal ) { KWin::setType( winId(), NET::Override ); KWin::setState( winId(), NET::SkipTaskbar ); diff --git a/kuickshow/src/aboutwidget.h b/kuickshow/src/aboutwidget.h index c3bd487f..7fd3455d 100644 --- a/kuickshow/src/aboutwidget.h +++ b/kuickshow/src/aboutwidget.h @@ -30,7 +30,7 @@ class AboutWidget : public TQVBox TQ_OBJECT public: - AboutWidget(TQWidget *tqparent = 0, const char *name = 0); + AboutWidget(TQWidget *parent = 0, const char *name = 0); protected: ~AboutWidget(); diff --git a/kuickshow/src/defaultswidget.cpp b/kuickshow/src/defaultswidget.cpp index c0596784..c0bef522 100644 --- a/kuickshow/src/defaultswidget.cpp +++ b/kuickshow/src/defaultswidget.cpp @@ -31,8 +31,8 @@ #include "imlibwidget.h" #include "defaultswidget.h" -DefaultsWidget::DefaultsWidget( TQWidget *tqparent, const char *name) - : TQWidget( tqparent, name ) +DefaultsWidget::DefaultsWidget( TQWidget *parent, const char *name) + : TQWidget( parent, name ) { imFiltered = 0L; diff --git a/kuickshow/src/defaultswidget.h b/kuickshow/src/defaultswidget.h index c9f74b67..3cc92ba8 100644 --- a/kuickshow/src/defaultswidget.h +++ b/kuickshow/src/defaultswidget.h @@ -36,7 +36,7 @@ class DefaultsWidget : public TQWidget TQ_OBJECT public: - DefaultsWidget( TQWidget *tqparent, const char *name ); + DefaultsWidget( TQWidget *parent, const char *name ); ~DefaultsWidget(); void loadSettings( const KuickData& data ); diff --git a/kuickshow/src/filefinder.cpp b/kuickshow/src/filefinder.cpp index 04a1f7a6..ae9914fe 100644 --- a/kuickshow/src/filefinder.cpp +++ b/kuickshow/src/filefinder.cpp @@ -26,8 +26,8 @@ #include "filefinder.h" -FileFinder::FileFinder( TQWidget *tqparent, const char *name ) - : KLineEdit( tqparent, name ) +FileFinder::FileFinder( TQWidget *parent, const char *name ) + : KLineEdit( parent, name ) { // make this widget just as large, as the font is + 8 Pixels int height = fontMetrics().height() + 8; diff --git a/kuickshow/src/filefinder.h b/kuickshow/src/filefinder.h index 3ec76797..ab41222f 100644 --- a/kuickshow/src/filefinder.h +++ b/kuickshow/src/filefinder.h @@ -31,7 +31,7 @@ class FileFinder : public KLineEdit TQ_OBJECT public: - FileFinder( TQWidget *tqparent=0, const char *name=0 ); + FileFinder( TQWidget *parent=0, const char *name=0 ); ~FileFinder(); KURLCompletion *completion() { diff --git a/kuickshow/src/filewidget.cpp b/kuickshow/src/filewidget.cpp index 0f1068fd..7bd52834 100644 --- a/kuickshow/src/filewidget.cpp +++ b/kuickshow/src/filewidget.cpp @@ -35,8 +35,8 @@ #undef KeyPress #endif -FileWidget::FileWidget( const KURL& url, TQWidget *tqparent, const char *name ) - : KDirOperator( url, tqparent, name ), +FileWidget::FileWidget( const KURL& url, TQWidget *parent, const char *name ) + : KDirOperator( url, parent, name ), m_validCompletion( false ), m_fileFinder( 0L ) { diff --git a/kuickshow/src/filewidget.h b/kuickshow/src/filewidget.h index 8591f9b5..64f11605 100644 --- a/kuickshow/src/filewidget.h +++ b/kuickshow/src/filewidget.h @@ -34,7 +34,7 @@ class FileWidget : public KDirOperator public: enum WhichItem { Previous, Next, Current }; - FileWidget( const KURL& url, TQWidget *tqparent = 0L, const char *name = 0L ); + FileWidget( const KURL& url, TQWidget *parent = 0L, const char *name = 0L ); ~FileWidget(); bool hasFiles() const; diff --git a/kuickshow/src/generalwidget.cpp b/kuickshow/src/generalwidget.cpp index 3b9b0352..bde353d6 100644 --- a/kuickshow/src/generalwidget.cpp +++ b/kuickshow/src/generalwidget.cpp @@ -33,8 +33,8 @@ #include "generalwidget.h" -GeneralWidget::GeneralWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +GeneralWidget::GeneralWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { TQVBoxLayout *tqlayout = new TQVBoxLayout( this ); tqlayout->setSpacing( KDialog::spacingHint() ); diff --git a/kuickshow/src/generalwidget.h b/kuickshow/src/generalwidget.h index d9665170..c8d6bec8 100644 --- a/kuickshow/src/generalwidget.h +++ b/kuickshow/src/generalwidget.h @@ -35,7 +35,7 @@ class GeneralWidget : public TQWidget TQ_OBJECT public: - GeneralWidget( TQWidget *tqparent, const char *name ); + GeneralWidget( TQWidget *parent, const char *name ); ~GeneralWidget(); void loadSettings( const KuickData& data ); diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp index 915443bb..215c8adb 100644 --- a/kuickshow/src/imagewindow.cpp +++ b/kuickshow/src/imagewindow.cpp @@ -74,15 +74,15 @@ TQCursor *ImageWindow::s_handCursor = 0L; -ImageWindow::ImageWindow( ImData *_idata, ImlibData *id, TQWidget *tqparent, +ImageWindow::ImageWindow( ImData *_idata, ImlibData *id, TQWidget *parent, const char *name ) - : ImlibWidget( _idata, id, tqparent, name ) + : ImlibWidget( _idata, id, parent, name ) { init(); } -ImageWindow::ImageWindow( ImData *_idata, TQWidget *tqparent, const char *name ) - : ImlibWidget( _idata, tqparent, name ) +ImageWindow::ImageWindow( ImData *_idata, TQWidget *parent, const char *name ) + : ImlibWidget( _idata, parent, name ) { init(); } diff --git a/kuickshow/src/imagewindow.h b/kuickshow/src/imagewindow.h index f7558667..611f4fc4 100644 --- a/kuickshow/src/imagewindow.h +++ b/kuickshow/src/imagewindow.h @@ -41,9 +41,9 @@ class ImageWindow : public ImlibWidget TQ_OBJECT public: - ImageWindow( ImData *_idata, ImlibData *id, TQWidget *tqparent=0, + ImageWindow( ImData *_idata, ImlibData *id, TQWidget *parent=0, const char *name=0 ); - ImageWindow( ImData *_idata=0, TQWidget *tqparent=0, const char *name=0 ); + ImageWindow( ImData *_idata=0, TQWidget *parent=0, const char *name=0 ); bool showNextImage( KuickFile * file ); bool showNextImage( const KURL& url ); diff --git a/kuickshow/src/imlibwidget.cpp b/kuickshow/src/imlibwidget.cpp index 14964b36..f42e6c14 100644 --- a/kuickshow/src/imlibwidget.cpp +++ b/kuickshow/src/imlibwidget.cpp @@ -43,8 +43,8 @@ const int ImlibWidget::ImlibOffset = 256; -ImlibWidget::ImlibWidget( ImData *_idata, TQWidget *tqparent, const char *name ) : - TQWidget( tqparent, name, WDestructiveClose ) +ImlibWidget::ImlibWidget( ImData *_idata, TQWidget *parent, const char *name ) : + TQWidget( parent, name, WDestructiveClose ) { idata = _idata; deleteImData = false; @@ -82,9 +82,9 @@ ImlibWidget::ImlibWidget( ImData *_idata, TQWidget *tqparent, const char *name ) } -ImlibWidget::ImlibWidget( ImData *_idata, ImlibData *_id, TQWidget *tqparent, +ImlibWidget::ImlibWidget( ImData *_idata, ImlibData *_id, TQWidget *parent, const char *name ) - : TQWidget( tqparent, name, WDestructiveClose ) + : TQWidget( parent, name, WDestructiveClose ) { id = _id; idata = _idata; @@ -525,13 +525,13 @@ void ImlibWidget::restoreCursor() // destroying the Imlib image X window. Therefore it needs to be temporarily reparented // away and reparented back to the new X window. // Reparenting may happen e.g. when doing the old-style (non-NETWM) fullscreen changes. -void ImlibWidget::reparent( TQWidget* tqparent, WFlags f, const TQPoint& p, bool showIt ) +void ImlibWidget::reparent( TQWidget* parent, WFlags f, const TQPoint& p, bool showIt ) { XWindowAttributes attr; XGetWindowAttributes( x11Display(), win, &attr ); XUnmapWindow( x11Display(), win ); XReparentWindow( x11Display(), win, attr.root, 0, 0 ); - TQWidget::reparent( tqparent, f, p, showIt ); + TQWidget::reparent( parent, f, p, showIt ); XReparentWindow( x11Display(), win, winId(), attr.x, attr.y ); if( attr.map_state != IsUnmapped ) XMapWindow( x11Display(), win ); diff --git a/kuickshow/src/imlibwidget.h b/kuickshow/src/imlibwidget.h index a2105531..97a2db96 100644 --- a/kuickshow/src/imlibwidget.h +++ b/kuickshow/src/imlibwidget.h @@ -80,8 +80,8 @@ class ImlibWidget : public TQWidget public: - ImlibWidget( ImData *_idata=0, TQWidget *tqparent=0, const char *name=0 ); - ImlibWidget( ImData *_idata, ImlibData *id, TQWidget *tqparent=0, + ImlibWidget( ImData *_idata=0, TQWidget *parent=0, const char *name=0 ); + ImlibWidget( ImData *_idata, ImlibData *id, TQWidget *parent=0, const char *name=0 ); virtual ~ImlibWidget(); @@ -121,7 +121,7 @@ public: ImlibData* getImlibData() const { return id; } - virtual void reparent( TQWidget* tqparent, WFlags f, const TQPoint& p, bool showIt = FALSE ); + virtual void reparent( TQWidget* parent, WFlags f, const TQPoint& p, bool showIt = FALSE ); public slots: void rotate90(); diff --git a/kuickshow/src/kuickconfigdlg.cpp b/kuickshow/src/kuickconfigdlg.cpp index 3d981e11..140c90d5 100644 --- a/kuickshow/src/kuickconfigdlg.cpp +++ b/kuickshow/src/kuickconfigdlg.cpp @@ -38,11 +38,11 @@ #include "kuickdata.h" -KuickConfigDialog::KuickConfigDialog( KActionCollection *_coll, TQWidget *tqparent, +KuickConfigDialog::KuickConfigDialog( KActionCollection *_coll, TQWidget *parent, const char *name, bool modal ) : KDialogBase( Tabbed, i18n("Configure"), Help | Default | Ok | Apply | Cancel, Ok, - tqparent, name, modal ) + parent, name, modal ) { coll = _coll; TQVBox *box = addVBoxPage( i18n("&General") ); diff --git a/kuickshow/src/kuickconfigdlg.h b/kuickshow/src/kuickconfigdlg.h index 9d7657b2..cab6655d 100644 --- a/kuickshow/src/kuickconfigdlg.h +++ b/kuickshow/src/kuickconfigdlg.h @@ -36,7 +36,7 @@ class KuickConfigDialog : public KDialogBase TQ_OBJECT public: - KuickConfigDialog( KActionCollection *coll, TQWidget *tqparent=0, + KuickConfigDialog( KActionCollection *coll, TQWidget *parent=0, const char *name=0, bool modal=true); ~KuickConfigDialog(); diff --git a/kuickshow/src/kuickfile.cpp b/kuickshow/src/kuickfile.cpp index 9aead634..22f553b7 100644 --- a/kuickshow/src/kuickfile.cpp +++ b/kuickshow/src/kuickfile.cpp @@ -94,7 +94,7 @@ bool KuickFile::download() return m_job != 0L; } -KuickFile::DownloadtqStatus KuickFile::waitForDownload( TQWidget *tqparent ) +KuickFile::DownloadtqStatus KuickFile::waitForDownload( TQWidget *parent ) { if ( isAvailable() ) return OK; @@ -104,7 +104,7 @@ KuickFile::DownloadtqStatus KuickFile::waitForDownload( TQWidget *tqparent ) return ERROR; } - KProgressDialog *dialog = new KProgressDialog( tqparent ); + KProgressDialog *dialog = new KProgressDialog( parent ); dialog->setModal( true ); dialog->setCaption( i18n("Downloading %1...").tqarg( m_url.fileName() ) ); dialog->setLabel( i18n("Please wait while downloading\n%1").tqarg( m_url.prettyURL() )); diff --git a/kuickshow/src/kuickfile.h b/kuickshow/src/kuickfile.h index 08fa4557..af92355f 100644 --- a/kuickshow/src/kuickfile.h +++ b/kuickshow/src/kuickfile.h @@ -72,7 +72,7 @@ public: * immediately. * @return true when the download has finished or false when the user aborted the dialog */ - KuickFile::DownloadtqStatus waitForDownload( TQWidget *tqparent ); + KuickFile::DownloadtqStatus waitForDownload( TQWidget *parent ); // bool needsDownload(); diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp index f1548119..62095b6e 100644 --- a/kuickshow/src/kuickshow.cpp +++ b/kuickshow/src/kuickshow.cpp @@ -631,7 +631,7 @@ void KuickShow::slotTrashCurrentImage(ImageWindow *viewer) performTrashCurrentImage(viewer); } -void KuickShow::performDeleteCurrentImage(TQWidget *tqparent) +void KuickShow::performDeleteCurrentImage(TQWidget *parent) { assert(fileWidget != 0L); @@ -640,7 +640,7 @@ void KuickShow::performDeleteCurrentImage(TQWidget *tqparent) list.append (item); if (KMessageBox::warningContinueCancel( - tqparent, + parent, i18n("<qt>Do you really want to delete\n <b>'%1'</b>?</qt>").tqarg(item->url().pathOrURL()), i18n("Delete File"), KStdGuiItem::del(), @@ -654,7 +654,7 @@ void KuickShow::performDeleteCurrentImage(TQWidget *tqparent) fileWidget->del(list, false, false); } -void KuickShow::performTrashCurrentImage(TQWidget *tqparent) +void KuickShow::performTrashCurrentImage(TQWidget *parent) { assert(fileWidget != 0L); @@ -665,7 +665,7 @@ void KuickShow::performTrashCurrentImage(TQWidget *tqparent) list.append (item); if (KMessageBox::warningContinueCancel( - tqparent, + parent, i18n("<qt>Do you really want to trash\n <b>'%1'</b>?</qt>").tqarg(item->url().pathOrURL()), i18n("Trash File"), KGuiItem(i18n("to trash", "&Trash"),"edittrash"), @@ -676,7 +676,7 @@ void KuickShow::performTrashCurrentImage(TQWidget *tqparent) } tryShowNextImage(); - fileWidget->trash(list, tqparent, false, false); + fileWidget->trash(list, parent, false, false); } void KuickShow::tryShowNextImage() diff --git a/kuickshow/src/kuickshow.h b/kuickshow/src/kuickshow.h index c8745287..56c1b204 100644 --- a/kuickshow/src/kuickshow.h +++ b/kuickshow/src/kuickshow.h @@ -156,8 +156,8 @@ private: void delayAction(DelayedRepeatEvent *event); void replayAdvance(DelayedRepeatEvent *event); - void performDeleteCurrentImage(TQWidget *tqparent); - void performTrashCurrentImage(TQWidget *tqparent); + void performDeleteCurrentImage(TQWidget *parent); + void performTrashCurrentImage(TQWidget *parent); uint viewItem, renameItem, deleteItem, printItem; uint m_slideshowCycle; diff --git a/kuickshow/src/kurlwidget.cpp b/kuickshow/src/kurlwidget.cpp index 3d231061..342c78c5 100644 --- a/kuickshow/src/kurlwidget.cpp +++ b/kuickshow/src/kurlwidget.cpp @@ -23,8 +23,8 @@ #include "kurlwidget.h" -KURLWidget::KURLWidget(const TQString& text, TQWidget *tqparent, const char *name) - : KURLLabel( tqparent, name ) +KURLWidget::KURLWidget(const TQString& text, TQWidget *parent, const char *name) + : KURLLabel( parent, name ) { setText( text ); connect( this, TQT_SIGNAL( leftClickedURL() ), TQT_SLOT( run() )); diff --git a/kuickshow/src/mainwidget.cpp b/kuickshow/src/mainwidget.cpp index b9e63576..d94d332e 100644 --- a/kuickshow/src/mainwidget.cpp +++ b/kuickshow/src/mainwidget.cpp @@ -21,8 +21,8 @@ #include "mainwidget.h" -MainWidget::MainWidget( TQString startDir, TQWidget *tqparent, - const char *name ) : TQWidget ( tqparent, name ) +MainWidget::MainWidget( TQString startDir, TQWidget *parent, + const char *name ) : TQWidget ( parent, name ) { box = new FileView( startDir, true, (TQDir::Dirs | TQDir::Files), this, "fileview" ); diff --git a/kuickshow/src/mainwidget.h b/kuickshow/src/mainwidget.h index 875fbcec..acee576b 100644 --- a/kuickshow/src/mainwidget.h +++ b/kuickshow/src/mainwidget.h @@ -31,7 +31,7 @@ class MainWidget : public TQWidget TQ_OBJECT public: - MainWidget( TQString, TQWidget *tqparent, const char *name=0L); + MainWidget( TQString, TQWidget *parent, const char *name=0L); ~MainWidget(); FileView* getFileBox() { return box; } diff --git a/kuickshow/src/printing.cpp b/kuickshow/src/printing.cpp index b77696d8..2c78a925 100644 --- a/kuickshow/src/printing.cpp +++ b/kuickshow/src/printing.cpp @@ -43,16 +43,16 @@ #include "printing.h" #include "version.h" -bool Printing::printImage( ImageWindow& imageWin, TQWidget *tqparent ) +bool Printing::printImage( ImageWindow& imageWin, TQWidget *parent ) { TQString imageURL = imageWin.url().prettyURL(); KPrinter printer; printer.setDocName( imageURL ); printer.setCreator( "KuickShow-" KUICKSHOWVERSION ); - KPrinter::addDialogPage( new KuickPrintDialogPage( tqparent, "kuick page")); + KPrinter::addDialogPage( new KuickPrintDialogPage( parent, "kuick page")); - if ( printer.setup( tqparent, i18n("Print %1").tqarg(printer.docName().section('/', -1)) ) ) + if ( printer.setup( parent, i18n("Print %1").tqarg(printer.docName().section('/', -1)) ) ) { KTempFile tmpFile( TQString(), ".png" ); if ( tmpFile.status() == 0 ) @@ -194,8 +194,8 @@ TQString Printing::minimizeString( TQString text, const TQFontMetrics& /////////////////////////////////////////////////////////////////// -KuickPrintDialogPage::KuickPrintDialogPage( TQWidget *tqparent, const char *name ) - : KPrintDialogPage( tqparent, name ) +KuickPrintDialogPage::KuickPrintDialogPage( TQWidget *parent, const char *name ) + : KPrintDialogPage( parent, name ) { setTitle( i18n("Image Settings") ); diff --git a/kuickshow/src/printing.h b/kuickshow/src/printing.h index f58f05da..065ea310 100644 --- a/kuickshow/src/printing.h +++ b/kuickshow/src/printing.h @@ -36,7 +36,7 @@ class ImageWindow; class Printing { public: - static bool printImage( ImageWindow& imageWin, TQWidget *tqparent = 0L); + static bool printImage( ImageWindow& imageWin, TQWidget *parent = 0L); static bool printImageWithTQt( const TQString& filename, KPrinter& printer, const TQString& originalFileName ); @@ -53,7 +53,7 @@ class KuickPrintDialogPage : public KPrintDialogPage TQ_OBJECT public: - KuickPrintDialogPage( TQWidget *tqparent = 0L, const char *name = 0 ); + KuickPrintDialogPage( TQWidget *parent = 0L, const char *name = 0 ); ~KuickPrintDialogPage(); virtual void getOptions(TQMap<TQString,TQString>& opts, bool incldef = false); diff --git a/kuickshow/src/slideshowwidget.cpp b/kuickshow/src/slideshowwidget.cpp index a35f159c..ed2bedc6 100644 --- a/kuickshow/src/slideshowwidget.cpp +++ b/kuickshow/src/slideshowwidget.cpp @@ -26,8 +26,8 @@ #include "slideshowwidget.h" -SlideShowWidget::SlideShowWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +SlideShowWidget::SlideShowWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { // setTitle( i18n("Slideshow") ); diff --git a/kuickshow/src/slideshowwidget.h b/kuickshow/src/slideshowwidget.h index 4408b20e..a9664426 100644 --- a/kuickshow/src/slideshowwidget.h +++ b/kuickshow/src/slideshowwidget.h @@ -29,7 +29,7 @@ class SlideShowWidget : public TQWidget Q_OBJECT TQ_OBJECT public: - SlideShowWidget( TQWidget *tqparent, const char *name ); + SlideShowWidget( TQWidget *parent, const char *name ); ~SlideShowWidget(); virtual void loadSettings( const KuickData& data ); diff --git a/kview/config/kviewconfmodules.cpp b/kview/config/kviewconfmodules.cpp index f84310e2..0a448b1a 100644 --- a/kview/config/kviewconfmodules.cpp +++ b/kview/config/kviewconfmodules.cpp @@ -32,8 +32,8 @@ typedef KGenericFactory<KViewGeneralConfig, TQWidget> KViewGeneralConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kviewgeneralconfig, KViewGeneralConfigFactory( "kcm_kviewgeneralconfig" ) ) -KViewGeneralConfig::KViewGeneralConfig( TQWidget * tqparent, const char * /*name*/, const TQStringList & args ) - : KCModule( KViewGeneralConfigFactory::instance(), tqparent, args ) +KViewGeneralConfig::KViewGeneralConfig( TQWidget * parent, const char * /*name*/, const TQStringList & args ) + : KCModule( KViewGeneralConfigFactory::instance(), parent, args ) { TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kview/config/kviewconfmodules.h b/kview/config/kviewconfmodules.h index bd01dbaf..91da7413 100644 --- a/kview/config/kviewconfmodules.h +++ b/kview/config/kviewconfmodules.h @@ -28,7 +28,7 @@ class KViewGeneralConfig : public KCModule Q_OBJECT TQ_OBJECT public: - KViewGeneralConfig( TQWidget * tqparent, const char * name = 0, const TQStringList & args = TQStringList() ); + KViewGeneralConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); ~KViewGeneralConfig(); virtual void load(); diff --git a/kview/config/plugins/kviewpluginsconfig.cpp b/kview/config/plugins/kviewpluginsconfig.cpp index cf085d3c..79b6b76b 100644 --- a/kview/config/plugins/kviewpluginsconfig.cpp +++ b/kview/config/plugins/kviewpluginsconfig.cpp @@ -28,8 +28,8 @@ typedef KGenericFactory<KViewPluginsConfig, TQWidget> KViewPluginsConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kviewpluginsconfig, KViewPluginsConfigFactory( "kcm_kviewpluginsconfig" ) ) -KViewPluginsConfig::KViewPluginsConfig( TQWidget * tqparent, const char *, const TQStringList & args ) - : KSettings::PluginPage( KViewPluginsConfigFactory::instance(), tqparent, args ) +KViewPluginsConfig::KViewPluginsConfig( TQWidget * parent, const char *, const TQStringList & args ) + : KSettings::PluginPage( KViewPluginsConfigFactory::instance(), parent, args ) { m_config = new KSimpleConfig( "kviewrc" ); pluginSelector()->addPlugins( TQString::fromAscii( "kview" ), i18n( "Application" ), TQString(), m_config ); diff --git a/kview/config/plugins/kviewpluginsconfig.h b/kview/config/plugins/kviewpluginsconfig.h index 3353bf6b..4d595a83 100644 --- a/kview/config/plugins/kviewpluginsconfig.h +++ b/kview/config/plugins/kviewpluginsconfig.h @@ -28,7 +28,7 @@ class KViewPluginsConfig : public KSettings::PluginPage Q_OBJECT TQ_OBJECT public: - KViewPluginsConfig( TQWidget * tqparent, const char * name = 0, const TQStringList & args = TQStringList() ); + KViewPluginsConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); ~KViewPluginsConfig(); private: KConfig * m_config; diff --git a/kview/kimageviewer/viewer.cpp b/kview/kimageviewer/viewer.cpp index 445cb6de..1a5890d6 100644 --- a/kview/kimageviewer/viewer.cpp +++ b/kview/kimageviewer/viewer.cpp @@ -22,8 +22,8 @@ namespace KImageViewer { - Viewer::Viewer( TQObject * tqparent, const char * name ) - : KParts::ReadWritePart( tqparent, name ) + Viewer::Viewer( TQObject * parent, const char * name ) + : KParts::ReadWritePart( parent, name ) { } diff --git a/kview/kimageviewer/viewer.h b/kview/kimageviewer/viewer.h index a656f049..b521710d 100644 --- a/kview/kimageviewer/viewer.h +++ b/kview/kimageviewer/viewer.h @@ -50,7 +50,7 @@ class KDE_EXPORT Viewer : public KParts::ReadWritePart Q_OBJECT TQ_OBJECT public: - Viewer( TQObject * tqparent = 0, const char * name = 0 ); + Viewer( TQObject * parent = 0, const char * name = 0 ); virtual ~Viewer(); diff --git a/kview/kviewcanvas/config/confmodules.cpp b/kview/kviewcanvas/config/confmodules.cpp index a90c1024..f9cf90cc 100644 --- a/kview/kviewcanvas/config/confmodules.cpp +++ b/kview/kviewcanvas/config/confmodules.cpp @@ -34,8 +34,8 @@ typedef KGenericFactory<KViewCanvasConfig, TQWidget> KViewCanvasConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kviewcanvasconfig, KViewCanvasConfigFactory( "kcm_kviewcanvasconfig" ) ) -KViewCanvasConfig::KViewCanvasConfig( TQWidget * tqparent, const char *, const TQStringList & args ) - : KCModule( KViewCanvasConfigFactory::instance(), tqparent, args ) +KViewCanvasConfig::KViewCanvasConfig( TQWidget * parent, const char *, const TQStringList & args ) + : KCModule( KViewCanvasConfigFactory::instance(), parent, args ) , m_config( new KConfig( "kviewcanvasrc" ) ) { TQBoxLayout * tqlayout = new TQVBoxLayout( this ); diff --git a/kview/kviewcanvas/config/confmodules.h b/kview/kviewcanvas/config/confmodules.h index 95fa00c6..d8760ff4 100644 --- a/kview/kviewcanvas/config/confmodules.h +++ b/kview/kviewcanvas/config/confmodules.h @@ -31,7 +31,7 @@ class KViewCanvasConfig : public KCModule Q_OBJECT TQ_OBJECT public: - KViewCanvasConfig( TQWidget * tqparent, const char * name = 0, const TQStringList & args = TQStringList() ); + KViewCanvasConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); ~KViewCanvasConfig(); void load(); diff --git a/kview/kviewcanvas/kimagecanvas.cpp b/kview/kviewcanvas/kimagecanvas.cpp index d3a8608b..a2e6c5b7 100644 --- a/kview/kviewcanvas/kimagecanvas.cpp +++ b/kview/kviewcanvas/kimagecanvas.cpp @@ -43,8 +43,8 @@ typedef KGenericFactory<KImageCanvas> KImageCanvasFactory; K_EXPORT_COMPONENT_FACTORY( libkviewcanvas, KImageCanvasFactory( "kviewcanvas" ) ) -KImageCanvas::KImageCanvas( TQWidget * tqparent, const char * name, const TQStringList & ) - : TQScrollView( tqparent, name, WResizeNoErase | WStaticContents ) +KImageCanvas::KImageCanvas( TQWidget * parent, const char * name, const TQStringList & ) + : TQScrollView( parent, name, WResizeNoErase | WStaticContents ) , m_client( 0 ) , m_oldClient( 0 ) , m_image( 0 ) diff --git a/kview/kviewcanvas/kimagecanvas.h b/kview/kviewcanvas/kimagecanvas.h index c7af475e..52b49aca 100644 --- a/kview/kviewcanvas/kimagecanvas.h +++ b/kview/kviewcanvas/kimagecanvas.h @@ -47,7 +47,7 @@ class KDE_EXPORT KImageCanvas : public TQScrollView, public KImageViewer::Canvas /** * KImageCanvas Constructor */ - KImageCanvas( TQWidget * tqparent, const char * name, const TQStringList & args ); + KImageCanvas( TQWidget * parent, const char * name, const TQStringList & args ); /** * KImageCanvas Destructor diff --git a/kview/kviewcanvas/kimageholder.cpp b/kview/kviewcanvas/kimageholder.cpp index 1bf3df98..f2e54462 100644 --- a/kview/kviewcanvas/kimageholder.cpp +++ b/kview/kviewcanvas/kimageholder.cpp @@ -33,8 +33,8 @@ #include "kimageholder.h" -KImageHolder::KImageHolder( TQWidget * tqparent, const char * name ) - : TQWidget( tqparent, name, TQt::WResizeNoErase | TQt::WRepaintNoErase ) +KImageHolder::KImageHolder( TQWidget * parent, const char * name ) + : TQWidget( parent, name, TQt::WResizeNoErase | TQt::WRepaintNoErase ) , m_selected( false ) , m_bSelecting( false ) , m_scrollTimerId( 0 ) @@ -96,7 +96,7 @@ void KImageHolder::mouseMoveEvent( TQMouseEvent *ev ) } else // create a selection { - TQWidget * parentwidget = ( TQWidget* )tqparent(); + TQWidget * parentwidget = ( TQWidget* )parent(); if( ! m_bSelecting ) { m_bSelecting = true; @@ -282,7 +282,7 @@ void KImageHolder::paintEvent( TQPaintEvent *ev ) painter.setClipRegion( ev->region().intersect( m_drawRect ) ); if( m_pPixmap ) { - if( m_pPixmap->tqmask() ) + if( m_pPixmap->mask() ) { if( ! m_pDoubleBuffer ) { diff --git a/kview/kviewcanvas/kimageholder.h b/kview/kviewcanvas/kimageholder.h index d8d220c0..165ec0bc 100644 --- a/kview/kviewcanvas/kimageholder.h +++ b/kview/kviewcanvas/kimageholder.h @@ -37,7 +37,7 @@ class KImageHolder : public TQWidget Q_OBJECT TQ_OBJECT public: - KImageHolder( TQWidget *tqparent = 0, const char * name = 0 ); + KImageHolder( TQWidget *parent = 0, const char * name = 0 ); virtual ~KImageHolder(); diff --git a/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp b/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp index a1576b49..122190f9 100644 --- a/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp +++ b/kview/kviewviewer/config/kviewviewerpluginsconfig.cpp @@ -30,8 +30,8 @@ typedef KGenericFactory<KViewViewerPluginsConfig, TQWidget> KViewViewerPluginsConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kviewviewerpluginsconfig, KViewViewerPluginsConfigFactory( "kcm_kviewviewerpluginsconfig" ) ) -KViewViewerPluginsConfig::KViewViewerPluginsConfig( TQWidget * tqparent, const char *, const TQStringList & args ) - : KSettings::PluginPage( KViewViewerPluginsConfigFactory::instance(), tqparent, args ) +KViewViewerPluginsConfig::KViewViewerPluginsConfig( TQWidget * parent, const char *, const TQStringList & args ) + : KSettings::PluginPage( KViewViewerPluginsConfigFactory::instance(), parent, args ) { m_config = new KSimpleConfig( "kviewviewerrc" ); pluginSelector()->addPlugins( TQString::fromAscii( "kviewviewer" ), i18n( "Viewer" ), TQString(), m_config ); diff --git a/kview/kviewviewer/config/kviewviewerpluginsconfig.h b/kview/kviewviewer/config/kviewviewerpluginsconfig.h index 94860fc9..b9ac90e3 100644 --- a/kview/kviewviewer/config/kviewviewerpluginsconfig.h +++ b/kview/kviewviewer/config/kviewviewerpluginsconfig.h @@ -28,7 +28,7 @@ class KViewViewerPluginsConfig : public KSettings::PluginPage Q_OBJECT TQ_OBJECT public: - KViewViewerPluginsConfig( TQWidget * tqparent, const char * name = 0, const TQStringList & args = TQStringList() ); + KViewViewerPluginsConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); ~KViewViewerPluginsConfig(); private: KConfig * m_config; diff --git a/kview/kviewviewer/imagesettings.cpp b/kview/kviewviewer/imagesettings.cpp index 10781565..a4259b05 100644 --- a/kview/kviewviewer/imagesettings.cpp +++ b/kview/kviewviewer/imagesettings.cpp @@ -24,8 +24,8 @@ #include <klocale.h> #include <kdialog.h> -ImageSettings::ImageSettings( TQWidget * tqparent, const char * name ) - : KPrintDialogPage( tqparent, name ) +ImageSettings::ImageSettings( TQWidget * parent, const char * name ) + : KPrintDialogPage( parent, name ) , m_pFitImage( 0 ) { setTitle( i18n( "Image Settings" ) ); diff --git a/kview/kviewviewer/imagesettings.h b/kview/kviewviewer/imagesettings.h index 07bb9af8..4d8b2144 100644 --- a/kview/kviewviewer/imagesettings.h +++ b/kview/kviewviewer/imagesettings.h @@ -28,7 +28,7 @@ class ImageSettings : public KPrintDialogPage Q_OBJECT TQ_OBJECT public: - ImageSettings( TQWidget * tqparent = 0, const char * name = 0 ); + ImageSettings( TQWidget * parent = 0, const char * name = 0 ); ~ImageSettings(); void setOptions( const TQMap<TQString, TQString> & opts ); diff --git a/kview/kviewviewer/kviewkonqextension.cpp b/kview/kviewviewer/kviewkonqextension.cpp index b47ea17d..ed93d6ea 100644 --- a/kview/kviewviewer/kviewkonqextension.cpp +++ b/kview/kviewviewer/kviewkonqextension.cpp @@ -33,9 +33,9 @@ #include <klocale.h> KViewKonqExtension::KViewKonqExtension( KImageViewer::Canvas * canvas, - KViewViewer *tqparent, const char *name ) - : KParts::BrowserExtension( tqparent, name ), - m_pViewer( tqparent ), + KViewViewer *parent, const char *name ) + : KParts::BrowserExtension( parent, name ), + m_pViewer( parent ), m_pCanvas( canvas ) { KGlobal::locale()->insertCatalogue("kview"); @@ -68,7 +68,7 @@ void KViewKonqExtension::print() printer.addDialogPage( new ImageSettings ); printer.setDocName( "KView: " + m_pViewer->url().fileName( false ) ); - if ( !printer.setup( ((KViewViewer *)tqparent())->widget(), i18n("Print %1").tqarg(m_pViewer->url().fileName( false )) ) ) + if ( !printer.setup( ((KViewViewer *)parent())->widget(), i18n("Print %1").tqarg(m_pViewer->url().fileName( false )) ) ) return; TQPainter painter; diff --git a/kview/kviewviewer/kviewkonqextension.h b/kview/kviewviewer/kviewkonqextension.h index fa986c81..f9db2879 100644 --- a/kview/kviewviewer/kviewkonqextension.h +++ b/kview/kviewviewer/kviewkonqextension.h @@ -31,7 +31,7 @@ class KViewKonqExtension: public KParts::BrowserExtension Q_OBJECT TQ_OBJECT public: - KViewKonqExtension( KImageViewer::Canvas *, KViewViewer *tqparent, const char *name = 0 ); + KViewKonqExtension( KImageViewer::Canvas *, KViewViewer *parent, const char *name = 0 ); virtual ~KViewKonqExtension() {} virtual void setXYOffset( int x, int y ); diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp index d4d2cda6..73d1bd92 100644 --- a/kview/kviewviewer/kviewviewer.cpp +++ b/kview/kviewviewer/kviewviewer.cpp @@ -56,8 +56,8 @@ typedef KParts::GenericFactory<KViewViewer> KViewViewerFactory; K_EXPORT_COMPONENT_FACTORY( libkviewviewer, KViewViewerFactory ) KViewViewer::KViewViewer( TQWidget *parentWidget, const char * /*widgetName*/, - TQObject *tqparent, const char *name, const TQStringList & ) - : KImageViewer::Viewer( tqparent, name ) + TQObject *parent, const char *name, const TQStringList & ) + : KImageViewer::Viewer( parent, name ) , m_pParentWidget( parentWidget ) , m_pJob( 0 ) , m_pExtension( 0 ) diff --git a/kview/kviewviewer/kviewviewer.h b/kview/kviewviewer/kviewviewer.h index f63808c8..3240badc 100644 --- a/kview/kviewviewer/kviewviewer.h +++ b/kview/kviewviewer/kviewviewer.h @@ -50,7 +50,7 @@ class KDE_EXPORT KViewViewer : public KImageViewer::Viewer, public KViewViewerIf public: KViewViewer( TQWidget * parentWidget, const char * widgetName, - TQObject * tqparent, const char * name, const TQStringList & ); + TQObject * parent, const char * name, const TQStringList & ); virtual ~KViewViewer(); KImageViewer::Canvas * canvas() const { return m_pCanvas; } diff --git a/kview/modules/browser/kviewbrowser.cpp b/kview/modules/browser/kviewbrowser.cpp index 7e52732b..936061eb 100644 --- a/kview/modules/browser/kviewbrowser.cpp +++ b/kview/modules/browser/kviewbrowser.cpp @@ -36,13 +36,13 @@ typedef KGenericFactory<KViewBrowser> KViewBrowserFactory; K_EXPORT_COMPONENT_FACTORY( kview_browserplugin, KViewBrowserFactory( "kviewbrowserplugin" ) ) -KViewBrowser::KViewBrowser( TQObject* tqparent, const char* name, const TQStringList & ) - : Plugin( tqparent, name ) +KViewBrowser::KViewBrowser( TQObject* parent, const char* name, const TQStringList & ) + : Plugin( parent, name ) , m_pDirLister( 0 ) , m_pFileItemList( 0 ) , m_bShowCurrent( false ) { - m_pViewer = static_cast<KImageViewer::Viewer *>( tqparent ); + m_pViewer = static_cast<KImageViewer::Viewer *>( parent ); if( m_pViewer ) { m_paBack = KStdAction::back ( this, TQT_SLOT( slotBack() ), actionCollection(), "previous_image" ); diff --git a/kview/modules/browser/kviewbrowser.h b/kview/modules/browser/kviewbrowser.h index ecae29f3..a065c237 100644 --- a/kview/modules/browser/kviewbrowser.h +++ b/kview/modules/browser/kviewbrowser.h @@ -35,7 +35,7 @@ class KViewBrowser : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - KViewBrowser( TQObject* tqparent, const char* name, const TQStringList & ); + KViewBrowser( TQObject* parent, const char* name, const TQStringList & ); virtual ~KViewBrowser(); private slots: diff --git a/kview/modules/effects/kvieweffects.cpp b/kview/modules/effects/kvieweffects.cpp index c1ac49c2..a2e57327 100644 --- a/kview/modules/effects/kvieweffects.cpp +++ b/kview/modules/effects/kvieweffects.cpp @@ -24,15 +24,15 @@ typedef KGenericFactory<KViewEffects> KViewEffectsFactory; K_EXPORT_COMPONENT_FACTORY( kview_effectsplugin, KViewEffectsFactory( "kvieweffectsplugin" ) ) -KViewEffects::KViewEffects( TQObject* tqparent, const char* name, const TQStringList & ) - : Plugin( tqparent, name ) +KViewEffects::KViewEffects( TQObject* parent, const char* name, const TQStringList & ) + : Plugin( parent, name ) , m_gamma( 0.5 ), m_lastgamma( -1.0 ) , m_opacity( 50 ), m_lastopacity( -1 ) , m_intensity( 50 ), m_lastintensity( -1 ) , m_color( white ) , m_image( 0 ) { - TQObjectList * viewerList = tqparent->queryList( 0, "KImageViewer Part", false, false ); + TQObjectList * viewerList = parent->queryList( 0, "KImageViewer Part", false, false ); m_pViewer = static_cast<KImageViewer::Viewer *>( viewerList->getFirst() ); delete viewerList; if( m_pViewer ) diff --git a/kview/modules/effects/kvieweffects.h b/kview/modules/effects/kvieweffects.h index 43c1b16d..90d9bba4 100644 --- a/kview/modules/effects/kvieweffects.h +++ b/kview/modules/effects/kvieweffects.h @@ -15,7 +15,7 @@ class KViewEffects : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - KViewEffects( TQObject* tqparent, const char* name, const TQStringList & ); + KViewEffects( TQObject* parent, const char* name, const TQStringList & ); virtual ~KViewEffects(); private slots: diff --git a/kview/modules/presenter/config/kviewpresenterconfig.cpp b/kview/modules/presenter/config/kviewpresenterconfig.cpp index edcf157d..3f868694 100644 --- a/kview/modules/presenter/config/kviewpresenterconfig.cpp +++ b/kview/modules/presenter/config/kviewpresenterconfig.cpp @@ -31,8 +31,8 @@ typedef KGenericFactory<KViewPresenterConfig, TQWidget> KViewPresenterConfigFactory; K_EXPORT_COMPONENT_FACTORY( kcm_kviewpresenterconfig, KViewPresenterConfigFactory( "kcm_kviewpresenterconfig" ) ) -KViewPresenterConfig::KViewPresenterConfig( TQWidget * tqparent, const char *, const TQStringList & args ) - : KCModule( KViewPresenterConfigFactory::instance(), tqparent, args ) +KViewPresenterConfig::KViewPresenterConfig( TQWidget * parent, const char *, const TQStringList & args ) + : KCModule( KViewPresenterConfigFactory::instance(), parent, args ) { TQBoxLayout * tqlayout = new TQVBoxLayout( this, KDialog::marginHint(), KDialog::spacingHint() ); tqlayout->setAutoAdd( true ); diff --git a/kview/modules/presenter/config/kviewpresenterconfig.h b/kview/modules/presenter/config/kviewpresenterconfig.h index d07c1506..91c5b6d6 100644 --- a/kview/modules/presenter/config/kviewpresenterconfig.h +++ b/kview/modules/presenter/config/kviewpresenterconfig.h @@ -28,7 +28,7 @@ class KViewPresenterConfig : public KCModule Q_OBJECT TQ_OBJECT public: - KViewPresenterConfig( TQWidget * tqparent, const char * name = 0, const TQStringList & args = TQStringList() ); + KViewPresenterConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() ); ~KViewPresenterConfig(); virtual void load(); diff --git a/kview/modules/presenter/imagelistitem.cpp b/kview/modules/presenter/imagelistitem.cpp index 870987be..441568ad 100644 --- a/kview/modules/presenter/imagelistitem.cpp +++ b/kview/modules/presenter/imagelistitem.cpp @@ -24,8 +24,8 @@ #include <klistview.h> -ImageListItem::ImageListItem( KListView * tqparent, const KURL & url ) - : KListViewItem( tqparent, tqparent->lastItem(), url.prettyURL() ) +ImageListItem::ImageListItem( KListView * parent, const KURL & url ) + : KListViewItem( parent, parent->lastItem(), url.prettyURL() ) , m_pImage( 0 ) , m_filename( TQString() ) , m_url( url ) diff --git a/kview/modules/presenter/imagelistitem.h b/kview/modules/presenter/imagelistitem.h index e54f84a4..ee143a90 100644 --- a/kview/modules/presenter/imagelistitem.h +++ b/kview/modules/presenter/imagelistitem.h @@ -30,7 +30,7 @@ class TQImage; class ImageListItem : public KListViewItem { public: - ImageListItem( KListView * tqparent, const KURL & url ); + ImageListItem( KListView * parent, const KURL & url ); ~ImageListItem(); const TQImage * image() const; diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp index 4f5eeb10..e7275c0d 100644 --- a/kview/modules/presenter/kviewpresenter.cpp +++ b/kview/modules/presenter/kviewpresenter.cpp @@ -51,8 +51,8 @@ typedef KGenericFactory<KViewPresenter> KViewPresenterFactory; K_EXPORT_COMPONENT_FACTORY( kview_presenterplugin, KViewPresenterFactory( "kviewpresenterplugin" ) ) -KViewPresenter::KViewPresenter( TQObject* tqparent, const char* name, const TQStringList & ) - : Plugin( tqparent, name ) +KViewPresenter::KViewPresenter( TQObject* parent, const char* name, const TQStringList & ) + : Plugin( parent, name ) , m_pImageList( new ImageListDialog() ) , m_paFileOpen( 0 ) , m_bDontAdd( false ) @@ -62,7 +62,7 @@ KViewPresenter::KViewPresenter( TQObject* tqparent, const char* name, const TQSt kdDebug( 4630 ) << k_funcinfo << endl; m_imagelist.setAutoDelete( true ); - TQObjectList * viewerList = tqparent->queryList( 0, "KImageViewer Part", false, false ); + TQObjectList * viewerList = parent->queryList( 0, "KImageViewer Part", false, false ); m_pViewer = static_cast<KImageViewer::Viewer *>( viewerList->getFirst() ); delete viewerList; if( m_pViewer ) @@ -82,7 +82,7 @@ KViewPresenter::KViewPresenter( TQObject* tqparent, const char* name, const TQSt connect( m_pImageList->m_pSlideshow, TQT_SIGNAL( toggled( bool ) ), m_paSlideshow, TQT_SLOT( setChecked( bool ) ) ); // search for file_open action - KXMLGUIClient * parentClient = static_cast<KXMLGUIClient*>( tqparent->qt_cast( "KXMLGUIClient" ) ); + KXMLGUIClient * parentClient = static_cast<KXMLGUIClient*>( parent->qt_cast( "KXMLGUIClient" ) ); if( parentClient ) { m_paFileOpen = parentClient->actionCollection()->action( "file_open" ); @@ -92,7 +92,7 @@ KViewPresenter::KViewPresenter( TQObject* tqparent, const char* name, const TQSt connect( m_paFileClose, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotClose() ) ); if( m_paFileOpen ) { - disconnect( m_paFileOpen, TQT_SIGNAL( activated() ), tqparent, TQT_SLOT( slotOpenFile() ) ); + disconnect( m_paFileOpen, TQT_SIGNAL( activated() ), parent, TQT_SLOT( slotOpenFile() ) ); connect( m_paFileOpen, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotOpenFiles() ) ); } else @@ -150,12 +150,12 @@ KViewPresenter::~KViewPresenter() if( m_paFileOpen ) { disconnect( m_paFileOpen, TQT_SIGNAL( activated() ), this, TQT_SLOT( slotOpenFiles() ) ); - // If the tqparent() doesn't exist we either leave the "File Open" action + // If the parent() doesn't exist we either leave the "File Open" action // in an unusable state or KView was just shutting down and therefor we // can ignore this. I've only seen the second one happening and to get - // rid of the TQObject::connect warning we do the tqparent() check. - if( tqparent() ) - connect( m_paFileOpen, TQT_SIGNAL( activated() ), tqparent(), TQT_SLOT( slotOpenFile() ) ); + // rid of the TQObject::connect warning we do the parent() check. + if( parent() ) + connect( m_paFileOpen, TQT_SIGNAL( activated() ), parent(), TQT_SLOT( slotOpenFile() ) ); } } diff --git a/kview/modules/presenter/kviewpresenter.h b/kview/modules/presenter/kviewpresenter.h index ba3198b2..df1f38ac 100644 --- a/kview/modules/presenter/kviewpresenter.h +++ b/kview/modules/presenter/kviewpresenter.h @@ -40,7 +40,7 @@ class KViewPresenter : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - KViewPresenter( TQObject* tqparent, const char* name, const TQStringList & ); + KViewPresenter( TQObject* parent, const char* name, const TQStringList & ); virtual ~KViewPresenter(); protected: diff --git a/kview/modules/presenter/kviewpresenterconfmodule.cpp b/kview/modules/presenter/kviewpresenterconfmodule.cpp index ef051c28..b6818271 100644 --- a/kview/modules/presenter/kviewpresenterconfmodule.cpp +++ b/kview/modules/presenter/kviewpresenterconfmodule.cpp @@ -29,8 +29,8 @@ #include <kglobal.h> #include <kconfig.h> -KViewPresenterConfModule::KViewPresenterConfModule( TQObject * tqparent ) - : KPreferencesModule( "kviewpresenter", tqparent, "KView Presenter Config Module" ) +KViewPresenterConfModule::KViewPresenterConfModule( TQObject * parent ) + : KPreferencesModule( "kviewpresenter", parent, "KView Presenter Config Module" ) { } diff --git a/kview/modules/presenter/kviewpresenterconfmodule.h b/kview/modules/presenter/kviewpresenterconfmodule.h index 8ecaa345..bef21e39 100644 --- a/kview/modules/presenter/kviewpresenterconfmodule.h +++ b/kview/modules/presenter/kviewpresenterconfmodule.h @@ -30,7 +30,7 @@ class KViewPresenterConfModule : public KPreferencesModule Q_OBJECT TQ_OBJECT public: - KViewPresenterConfModule( TQObject * tqparent ); + KViewPresenterConfModule( TQObject * parent ); ~KViewPresenterConfModule(); signals: diff --git a/kview/modules/scale/kfloatspinbox.cpp b/kview/modules/scale/kfloatspinbox.cpp index 428dc2ee..6870a20b 100644 --- a/kview/modules/scale/kfloatspinbox.cpp +++ b/kview/modules/scale/kfloatspinbox.cpp @@ -37,8 +37,8 @@ int pow( int a, int b ) return ret; } -KFloatSpinBox::KFloatSpinBox( float minValue, float maxValue, float step, unsigned int precision, TQWidget * tqparent, const char * name ) - : TQSpinBox( tqparent, name ) +KFloatSpinBox::KFloatSpinBox( float minValue, float maxValue, float step, unsigned int precision, TQWidget * parent, const char * name ) + : TQSpinBox( parent, name ) , m_doselection( true ) { setRange( minValue, maxValue, step, precision ); diff --git a/kview/modules/scale/kfloatspinbox.h b/kview/modules/scale/kfloatspinbox.h index 572fc952..5c8897c0 100644 --- a/kview/modules/scale/kfloatspinbox.h +++ b/kview/modules/scale/kfloatspinbox.h @@ -28,7 +28,7 @@ class KFloatSpinBox : public TQSpinBox Q_OBJECT TQ_OBJECT public: - KFloatSpinBox( float minValue, float maxValue, float step, unsigned int precision, TQWidget * tqparent = 0, const char * name = 0 ); + KFloatSpinBox( float minValue, float maxValue, float step, unsigned int precision, TQWidget * parent = 0, const char * name = 0 ); virtual ~KFloatSpinBox(); void setRange( float minValue, float maxValue, float step, unsigned int precision ); diff --git a/kview/modules/scale/kview_scale.cpp b/kview/modules/scale/kview_scale.cpp index 39cf9e37..95802df4 100644 --- a/kview/modules/scale/kview_scale.cpp +++ b/kview/modules/scale/kview_scale.cpp @@ -35,12 +35,12 @@ typedef KGenericFactory<KViewScale> KViewScaleFactory; K_EXPORT_COMPONENT_FACTORY( kview_scale, KViewScaleFactory( "kview_scale" ) ) -KViewScale::KViewScale( TQObject* tqparent, const char* name, const TQStringList & ) - : Plugin( tqparent, name ) +KViewScale::KViewScale( TQObject* parent, const char* name, const TQStringList & ) + : Plugin( parent, name ) , m_pViewer( 0 ) , m_pCanvas( 0 ) { - m_pViewer = static_cast<KImageViewer::Viewer *>( tqparent ); + m_pViewer = static_cast<KImageViewer::Viewer *>( parent ); if( m_pViewer ) { kdDebug( 4630 ) << "m_pViewer->canvas() = " << m_pViewer->canvas() << endl; diff --git a/kview/modules/scale/kview_scale.h b/kview/modules/scale/kview_scale.h index 99417425..a3be4e48 100644 --- a/kview/modules/scale/kview_scale.h +++ b/kview/modules/scale/kview_scale.h @@ -33,7 +33,7 @@ class KViewScale : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - KViewScale( TQObject* tqparent, const char* name, const TQStringList & ); + KViewScale( TQObject* parent, const char* name, const TQStringList & ); virtual ~KViewScale(); private slots: diff --git a/kview/modules/scale/scaledlg.cpp b/kview/modules/scale/scaledlg.cpp index 8483f763..335ab1c9 100644 --- a/kview/modules/scale/scaledlg.cpp +++ b/kview/modules/scale/scaledlg.cpp @@ -37,8 +37,8 @@ #define ONEINCHINMM 2.54 -ScaleDlg::ScaleDlg( const TQSize & origsize, TQVBox * tqparent, const char * name ) - : TQObject( tqparent, name ) +ScaleDlg::ScaleDlg( const TQSize & origsize, TQVBox * parent, const char * name ) + : TQObject( parent, name ) , m_origsize( origsize ) , m_newsizeunit( 0 ) , m_newsizeunit2( 0 ) @@ -48,8 +48,8 @@ ScaleDlg::ScaleDlg( const TQSize & origsize, TQVBox * tqparent, const char * nam , m_resx( 72 ) , m_resy( 72 ) { - TQGroupBox * pixelgroup = new TQGroupBox( i18n( "Pixel Dimensions" ), tqparent ); - TQGroupBox * printgroup = new TQGroupBox( i18n( "Print Size && Display Units" ), tqparent ); + TQGroupBox * pixelgroup = new TQGroupBox( i18n( "Pixel Dimensions" ), parent ); + TQGroupBox * printgroup = new TQGroupBox( i18n( "Print Size && Display Units" ), parent ); TQGridLayout * pixelgroupgrid = new TQGridLayout( pixelgroup, 1, 1, KDialog::marginHint(), KDialog::spacingHint() ); diff --git a/kview/modules/scale/scaledlg.h b/kview/modules/scale/scaledlg.h index 9c039d8c..dace8109 100644 --- a/kview/modules/scale/scaledlg.h +++ b/kview/modules/scale/scaledlg.h @@ -35,7 +35,7 @@ class ScaleDlg : public TQObject Q_OBJECT TQ_OBJECT public: - ScaleDlg( const TQSize & originalsize, TQVBox * tqparent, const char * name = 0 ); + ScaleDlg( const TQSize & originalsize, TQVBox * parent, const char * name = 0 ); ~ScaleDlg(); private slots: diff --git a/kview/modules/scanner/kviewscanner.cpp b/kview/modules/scanner/kviewscanner.cpp index 9f8b370c..bf99e282 100644 --- a/kview/modules/scanner/kviewscanner.cpp +++ b/kview/modules/scanner/kviewscanner.cpp @@ -35,13 +35,13 @@ typedef KGenericFactory<KViewScanner> KViewScannerFactory; K_EXPORT_COMPONENT_FACTORY( kview_scannerplugin, KViewScannerFactory( "kviewscannerplugin" ) ) -KViewScanner::KViewScanner( TQObject* tqparent, const char* name, +KViewScanner::KViewScanner( TQObject* parent, const char* name, const TQStringList & ) - : Plugin( tqparent, name ), + : Plugin( parent, name ), m_pScandlg( 0 ), m_pViewer( 0 ) { - TQObjectList * viewerList = tqparent->queryList( 0, "KImageViewer Part", false, false ); + TQObjectList * viewerList = parent->queryList( 0, "KImageViewer Part", false, false ); m_pViewer = static_cast<KImageViewer::Viewer *>( viewerList->getFirst() ); delete viewerList; if( m_pViewer ) diff --git a/kview/modules/scanner/kviewscanner.h b/kview/modules/scanner/kviewscanner.h index 2c5abc77..c0f8f7c8 100644 --- a/kview/modules/scanner/kviewscanner.h +++ b/kview/modules/scanner/kviewscanner.h @@ -33,7 +33,7 @@ class KViewScanner : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - KViewScanner( TQObject* tqparent, const char* name, const TQStringList & ); + KViewScanner( TQObject* parent, const char* name, const TQStringList & ); virtual ~KViewScanner(); //public slots: diff --git a/kview/modules/template/kviewtemplate.cpp b/kview/modules/template/kviewtemplate.cpp index 54869912..f8277162 100644 --- a/kview/modules/template/kviewtemplate.cpp +++ b/kview/modules/template/kviewtemplate.cpp @@ -15,10 +15,10 @@ typedef KGenericFactory<KViewTemplate> KViewTemplateFactory; K_EXPORT_COMPONENT_FACTORY( kview_templateplugin, KViewTemplateFactory( "kviewtemplateplugin" ) ) -KViewTemplate::KViewTemplate( TQObject* tqparent, const char* name, const TQStringList & ) - : Plugin( tqparent, name ) +KViewTemplate::KViewTemplate( TQObject* parent, const char* name, const TQStringList & ) + : Plugin( parent, name ) { - TQObjectList * viewerList = tqparent->queryList( 0, "KImageViewer Part", false, false ); + TQObjectList * viewerList = parent->queryList( 0, "KImageViewer Part", false, false ); m_pViewer = static_cast<KImageViewer::Viewer *>( viewerList->getFirst() ); delete viewerList; if( m_pViewer ) diff --git a/kview/modules/template/kviewtemplate.h b/kview/modules/template/kviewtemplate.h index 03470b3d..379a4cc8 100644 --- a/kview/modules/template/kviewtemplate.h +++ b/kview/modules/template/kviewtemplate.h @@ -14,7 +14,7 @@ class KViewTemplate : public KParts::Plugin Q_OBJECT TQ_OBJECT public: - KViewTemplate( TQObject* tqparent, const char* name, const TQStringList & ); + KViewTemplate( TQObject* parent, const char* name, const TQStringList & ); virtual ~KViewTemplate(); private slots: diff --git a/kview/photobook/photobook.cpp b/kview/photobook/photobook.cpp index 8503188d..9fcb1603 100644 --- a/kview/photobook/photobook.cpp +++ b/kview/photobook/photobook.cpp @@ -44,10 +44,10 @@ Copyright (c) 2004,2005 Charles Samuels <charles@kde.org> #include <kstdaccel.h> #include <kstandarddirs.h> -Previews::Previews(PhotoBook *tqparent, const TQStringList &mimetypes) - : KFileIconView(tqparent, 0) +Previews::Previews(PhotoBook *parent, const TQStringList &mimetypes) + : KFileIconView(parent, 0) { - mPhotoBook = tqparent; + mPhotoBook = parent; mMimeTypes = mimetypes; connect(&mDirLister, TQT_SIGNAL(clear()), TQT_SLOT(slotClearView())); @@ -149,8 +149,8 @@ void Previews::goToFirst() -PhotoBook::PhotoBook(TQWidget *tqparent, PhotoBookPart *part, const char *name) - : TQSplitter(tqparent, name) +PhotoBook::PhotoBook(TQWidget *parent, PhotoBookPart *part, const char *name) + : TQSplitter(parent, name) { TQStringList mimetypes; @@ -221,10 +221,10 @@ K_EXPORT_COMPONENT_FACTORY(libphotobook, PhotoBookFactory ) PhotoBookPart::PhotoBookPart( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name, + TQObject *parent, const char *name, const TQStringList& ) - : KParts::ReadOnlyPart(tqparent, name) + : KParts::ReadOnlyPart(parent, name) { setInstance(PhotoBookFactory::instance()); diff --git a/kview/photobook/photobook.h b/kview/photobook/photobook.h index 2ce243a9..cd1d7536 100644 --- a/kview/photobook/photobook.h +++ b/kview/photobook/photobook.h @@ -59,7 +59,7 @@ TQ_OBJECT KParts::ReadOnlyPart *mViewer; public: - PhotoBook(TQWidget *tqparent, PhotoBookPart *part, const char *name=0); + PhotoBook(TQWidget *parent, PhotoBookPart *part, const char *name=0); void openURL(const KURL &url); void updateButton(bool, bool ); @@ -81,7 +81,7 @@ class Previews : public KFileIconView TQStringList mMimeTypes; public: - Previews(PhotoBook *tqparent, const TQStringList &mimetypes); + Previews(PhotoBook *parent, const TQStringList &mimetypes); ~Previews(); void openURL(const KURL &url); @@ -116,7 +116,7 @@ Q_OBJECT public: PhotoBookPart( TQWidget *parentWidget, const char *widgetName, - TQObject *tqparent, const char *name=0, + TQObject *parent, const char *name=0, const TQStringList& args = TQStringList() ); ~PhotoBookPart(); diff --git a/kviewshell/documentRenderer.h b/kviewshell/documentRenderer.h index 69ec87cb..82d2085e 100644 --- a/kviewshell/documentRenderer.h +++ b/kviewshell/documentRenderer.h @@ -55,7 +55,7 @@ class DocumentRenderer : public TQObject public: /** \brief default constructor */ - DocumentRenderer(TQWidget* tqparent); + DocumentRenderer(TQWidget* parent); virtual ~DocumentRenderer(); @@ -442,7 +442,7 @@ protected: */ TQMap<TQString, Anchor> anchorList; - /** pointer to the tqparent widget + /** pointer to the parent widget This pointer can be used by implementations e.g. to display error messages. This pointer can well be zero. diff --git a/kviewshell/documentWidget.cpp b/kviewshell/documentWidget.cpp index 875a70dc..f92da793 100644 --- a/kviewshell/documentWidget.cpp +++ b/kviewshell/documentWidget.cpp @@ -65,8 +65,8 @@ TQPixmap* BLShadow = 0; } // namespace anon -DocumentWidget::DocumentWidget(TQWidget *tqparent, PageView *sv, DocumentPageCache *cache, const char *name ) - : TQWidget( tqparent, name ), indexOfUnderlinedLink(-1) +DocumentWidget::DocumentWidget(TQWidget *parent, PageView *sv, DocumentPageCache *cache, const char *name ) + : TQWidget( parent, name ), indexOfUnderlinedLink(-1) { moveTool = true; diff --git a/kviewshell/documentWidget.h b/kviewshell/documentWidget.h index 29a20b79..fcec6646 100644 --- a/kviewshell/documentWidget.h +++ b/kviewshell/documentWidget.h @@ -33,7 +33,7 @@ class DocumentWidget : public TQWidget TQ_OBJECT public: - DocumentWidget(TQWidget *tqparent, PageView *sv, DocumentPageCache *cache, const char *name); + DocumentWidget(TQWidget *parent, PageView *sv, DocumentPageCache *cache, const char *name); void setPageNumber(TQ_UINT16 pageNr); TQ_UINT16 getPageNumber() const {return pageNr;} diff --git a/kviewshell/emptyRenderer.cpp b/kviewshell/emptyRenderer.cpp index 876f1995..deeef488 100644 --- a/kviewshell/emptyRenderer.cpp +++ b/kviewshell/emptyRenderer.cpp @@ -21,8 +21,8 @@ #include "emptyRenderer.h" -EmptyRenderer::EmptyRenderer(TQWidget* tqparent) - : DocumentRenderer(tqparent) +EmptyRenderer::EmptyRenderer(TQWidget* parent) + : DocumentRenderer(parent) { } diff --git a/kviewshell/emptyRenderer.h b/kviewshell/emptyRenderer.h index 4496a36b..8dead192 100644 --- a/kviewshell/emptyRenderer.h +++ b/kviewshell/emptyRenderer.h @@ -32,7 +32,7 @@ class EmptyRenderer : public DocumentRenderer TQ_OBJECT public: - EmptyRenderer(TQWidget* tqparent); + EmptyRenderer(TQWidget* parent); virtual bool setFile(const TQString &, const KURL &) { return false; } diff --git a/kviewshell/empty_multipage.cpp b/kviewshell/empty_multipage.cpp index 06d5d396..8fc1a0f8 100644 --- a/kviewshell/empty_multipage.cpp +++ b/kviewshell/empty_multipage.cpp @@ -26,9 +26,9 @@ K_EXPORT_COMPONENT_FACTORY(emptymultipagepart, EmptyMultiPageFactory) -EmptyMultiPage::EmptyMultiPage(TQWidget* parentWidget, const char* widgetName, TQObject* tqparent, const char* name, +EmptyMultiPage::EmptyMultiPage(TQWidget* parentWidget, const char* widgetName, TQObject* parent, const char* name, const TQStringList& args) - : KMultiPage(parentWidget, widgetName, tqparent, name), emptyRenderer(parentWidget) + : KMultiPage(parentWidget, widgetName, parent, name), emptyRenderer(parentWidget) { Q_UNUSED(args); setInstance(EmptyMultiPageFactory::instance()); diff --git a/kviewshell/empty_multipage.h b/kviewshell/empty_multipage.h index a77badda..68d0e538 100644 --- a/kviewshell/empty_multipage.h +++ b/kviewshell/empty_multipage.h @@ -33,7 +33,7 @@ class EmptyMultiPage : public KMultiPage TQ_OBJECT public: - EmptyMultiPage(TQWidget* parentWidget, const char* widgetName, TQObject* tqparent, const char* name, + EmptyMultiPage(TQWidget* parentWidget, const char* widgetName, TQObject* parent, const char* name, const TQStringList& args = TQStringList()); virtual TQStringList fileFormats() const { return TQString(); } diff --git a/kviewshell/kmultipage.cpp b/kviewshell/kmultipage.cpp index 3ba3fa84..afe04fd1 100644 --- a/kviewshell/kmultipage.cpp +++ b/kviewshell/kmultipage.cpp @@ -34,8 +34,8 @@ //#define DEBUG_KMULTIPAGE -KMultiPage::KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name) - : DCOPObject("kmultipage"), KParts::ReadOnlyPart(tqparent, name) +KMultiPage::KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name) + : DCOPObject("kmultipage"), KParts::ReadOnlyPart(parent, name) { // For reasons which I don't understand, the initialization of the // DCOPObject above does not work properly, the name is ignored. It diff --git a/kviewshell/kmultipage.h b/kviewshell/kmultipage.h index a470ab9d..d09115fd 100644 --- a/kviewshell/kmultipage.h +++ b/kviewshell/kmultipage.h @@ -40,7 +40,7 @@ class KMultiPage : public KParts::ReadOnlyPart, virtual public kmultipageInterfa TQ_OBJECT public: - KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name); + KMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name); virtual ~KMultiPage(); /* returns the scrollview used for the display */ @@ -565,7 +565,7 @@ protected: KPrinter *getPrinter(bool enablePageSizeFeatures=true); - /** Pointer to the tqparent widget + /** Pointer to the parent widget This pointer is automatically set by the constructor. */ diff --git a/kviewshell/kprintDialogPage_pageoptions.cpp b/kviewshell/kprintDialogPage_pageoptions.cpp index 77ff0949..603c2552 100644 --- a/kviewshell/kprintDialogPage_pageoptions.cpp +++ b/kviewshell/kprintDialogPage_pageoptions.cpp @@ -20,8 +20,8 @@ #include "kprintDialogPage_pageoptions.h" -KPrintDialogPage_PageOptions::KPrintDialogPage_PageOptions( TQWidget *tqparent, const char *name ) - : KPrintDialogPage( tqparent, name ) +KPrintDialogPage_PageOptions::KPrintDialogPage_PageOptions( TQWidget *parent, const char *name ) + : KPrintDialogPage( parent, name ) { setTitle( i18n("Page Size & Placement") ); diff --git a/kviewshell/kprintDialogPage_pageoptions.h b/kviewshell/kprintDialogPage_pageoptions.h index 4ae81eb8..8fea375f 100644 --- a/kviewshell/kprintDialogPage_pageoptions.h +++ b/kviewshell/kprintDialogPage_pageoptions.h @@ -24,7 +24,7 @@ class TQVBoxLayout; class KPrintDialogPage_PageOptions : public KPrintDialogPage { public: - KPrintDialogPage_PageOptions( TQWidget *tqparent = 0, const char *name = 0 ); + KPrintDialogPage_PageOptions( TQWidget *parent = 0, const char *name = 0 ); void getOptions( TQMap<TQString,TQString>& opts, bool incldef = false ); void setOptions( const TQMap<TQString,TQString>& opts ); diff --git a/kviewshell/kviewpart.cpp b/kviewshell/kviewpart.cpp index a5766c42..186a2823 100644 --- a/kviewshell/kviewpart.cpp +++ b/kviewshell/kviewpart.cpp @@ -56,9 +56,9 @@ typedef KParts::GenericFactory<KViewPart> KViewPartFactory; K_EXPORT_COMPONENT_FACTORY(kviewerpart, KViewPartFactory) -KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, +KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& args) - : KViewPart_Iface(tqparent, name), showSidebar(0), saveAction(0), partManager(0), + : KViewPart_Iface(parent, name), showSidebar(0), saveAction(0), partManager(0), multiPageLibrary(TQString()), aboutDialog(0) { KGlobal::locale()->insertCatalogue("kviewshell"); @@ -161,7 +161,7 @@ KViewPart::KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *t emit setStatusBarText(TQString()); return; } - // Make the KViewPart the tqparent of the MultiPage. + // Make the KViewPart the parent of the MultiPage. // So the Partmanager treats it as a nested KPart. insertChild(multiPage); @@ -1491,8 +1491,8 @@ void KViewPart::slotEnableMoveTool(bool enable) } -KViewPartExtension::KViewPartExtension(KViewPart *tqparent) - : KParts::BrowserExtension( tqparent, "KViewPartExtension") +KViewPartExtension::KViewPartExtension(KViewPart *parent) + : KParts::BrowserExtension( parent, "KViewPartExtension") { } diff --git a/kviewshell/kviewpart.h b/kviewshell/kviewpart.h index 7390faa1..9dedf264 100644 --- a/kviewshell/kviewpart.h +++ b/kviewshell/kviewpart.h @@ -34,7 +34,7 @@ class KViewPart : public KViewPart_Iface TQ_OBJECT public: - KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, + KViewPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& args); virtual ~KViewPart(); @@ -245,7 +245,7 @@ class KViewPartExtension : public KParts::BrowserExtension public: - KViewPartExtension(KViewPart *tqparent); + KViewPartExtension(KViewPart *parent); virtual ~KViewPartExtension() {} }; diff --git a/kviewshell/kviewpart_iface.h b/kviewshell/kviewpart_iface.h index ac7869de..aaa11b97 100644 --- a/kviewshell/kviewpart_iface.h +++ b/kviewshell/kviewpart_iface.h @@ -12,8 +12,8 @@ class KViewPart_Iface : public KParts::ReadOnlyPart Q_OBJECT TQ_OBJECT public: - KViewPart_Iface(TQObject *tqparent, const char *name) - : KParts::ReadOnlyPart(tqparent, name) {} + KViewPart_Iface(TQObject *parent, const char *name) + : KParts::ReadOnlyPart(parent, name) {} virtual ~KViewPart_Iface() {} diff --git a/kviewshell/marklist.cpp b/kviewshell/marklist.cpp index c28c1aaf..19d17b06 100644 --- a/kviewshell/marklist.cpp +++ b/kviewshell/marklist.cpp @@ -55,7 +55,7 @@ TQPixmap* waitIcon = 0; /****** ThumbnailWidget ******/ ThumbnailWidget::ThumbnailWidget(MarkListWidget* _parent, const PageNumber& _pageNumber, DocumentPageCache* _pageCache) - : TQWidget(_parent), pageNumber(_pageNumber), pageCache(_pageCache), tqparent(_parent) + : TQWidget(_parent), pageNumber(_pageNumber), pageCache(_pageCache), parent(_parent) { setBackgroundMode(TQt::NoBackground); @@ -73,7 +73,7 @@ void ThumbnailWidget::paintEvent(TQPaintEvent* e) // sends paintEvents to all widgets that have ever been visible in the Scrollview // whenever the ScrollView is resized. This also increases the percieved performance // only thumbnails that are really needed are rendered. - if (!tqparent->isVisible()) + if (!parent->isVisible()) { //kdDebug() << "Abort Thumbnail drawing for page " << pageNumber << endl; return; @@ -138,7 +138,7 @@ void ThumbnailWidget::resizeEvent(TQResizeEvent*) void ThumbnailWidget::setThumbnail() { - if (!tqparent->isVisible()) + if (!parent->isVisible()) { // We only want to calculate the thumbnail for widgets that are currently visible. // When we are fast scrolling thru the document. Many paint events are created, that @@ -272,8 +272,8 @@ void MarkListWidget::mousePressEvent(TQMouseEvent* e) /****** MarkList ******/ -MarkList::MarkList(TQWidget* tqparent, const char* name) - : TQScrollView(tqparent, name), clickedThumbnail(0), showThumbnails(true), contextMenu(0) +MarkList::MarkList(TQWidget* parent, const char* name) + : TQScrollView(parent, name), clickedThumbnail(0), showThumbnails(true), contextMenu(0) { currentPage = PageNumber::invalidPage; widgetList.setAutoDelete(true); diff --git a/kviewshell/marklist.h b/kviewshell/marklist.h index 9f64891c..25c44aac 100644 --- a/kviewshell/marklist.h +++ b/kviewshell/marklist.h @@ -62,7 +62,7 @@ private: DocumentPageCache* pageCache; - MarkListWidget* tqparent; + MarkListWidget* parent; TQPixmap thumbnail; }; @@ -129,7 +129,7 @@ class MarkList: public TQScrollView TQ_OBJECT public: - MarkList(TQWidget* tqparent = 0, const char* name = 0); + MarkList(TQWidget* parent = 0, const char* name = 0); virtual ~MarkList(); void setPageCache(DocumentPageCache*); diff --git a/kviewshell/pageSizeDialog.cpp b/kviewshell/pageSizeDialog.cpp index a059804a..fba7f752 100644 --- a/kviewshell/pageSizeDialog.cpp +++ b/kviewshell/pageSizeDialog.cpp @@ -25,8 +25,8 @@ #include "pageSizeWidget.h" -pageSizeDialog::pageSizeDialog( TQWidget *tqparent, pageSize *userPrefdPageSize, const char *name, bool modal) - :KDialogBase( tqparent, name, modal, i18n("Page Size"), Ok|Apply|Cancel, Ok, +pageSizeDialog::pageSizeDialog( TQWidget *parent, pageSize *userPrefdPageSize, const char *name, bool modal) + :KDialogBase( parent, name, modal, i18n("Page Size"), Ok|Apply|Cancel, Ok, true ) { userPreferredPageSize = userPrefdPageSize; diff --git a/kviewshell/pageSizeDialog.h b/kviewshell/pageSizeDialog.h index f1b45a56..b0a0f1f9 100644 --- a/kviewshell/pageSizeDialog.h +++ b/kviewshell/pageSizeDialog.h @@ -37,7 +37,7 @@ public: // value whenever the user clicks on 'accept' or 'ok'. Programmers // can then connect to the signal sizeChanged() of the object to be // informed about the changes. - pageSizeDialog( TQWidget *tqparent=0, pageSize *userPrefdPageSize=0, const char *name=0, bool modal=true); + pageSizeDialog( TQWidget *parent=0, pageSize *userPrefdPageSize=0, const char *name=0, bool modal=true); void setPageSize(const TQString&); protected slots: diff --git a/kviewshell/pageSizeWidget.cpp b/kviewshell/pageSizeWidget.cpp index 5446fd53..9f2503d2 100644 --- a/kviewshell/pageSizeWidget.cpp +++ b/kviewshell/pageSizeWidget.cpp @@ -21,10 +21,10 @@ -// Constructs a pageSizeWidget_base which is a child of 'tqparent', with +// Constructs a pageSizeWidget_base which is a child of 'parent', with // the name 'name' and widget flags set to 'f'. -pageSizeWidget::pageSizeWidget( TQWidget* tqparent, const char* name, WFlags fl ) - : pageSizeWidget_base( tqparent, name, fl ) +pageSizeWidget::pageSizeWidget( TQWidget* parent, const char* name, WFlags fl ) + : pageSizeWidget_base( parent, name, fl ) { connect(&chosenSize, TQT_SIGNAL(sizeChanged(const SimplePageSize&)), previewer, TQT_SLOT(setSize(const SimplePageSize&))); diff --git a/kviewshell/pageSizeWidget.h b/kviewshell/pageSizeWidget.h index 987dd3d3..b8df5389 100644 --- a/kviewshell/pageSizeWidget.h +++ b/kviewshell/pageSizeWidget.h @@ -22,7 +22,7 @@ class pageSizeWidget : public pageSizeWidget_base TQ_OBJECT public: - pageSizeWidget( TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + pageSizeWidget( TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); // Sets the page size. If the dialog is already shown, updates all // the GUI. Accepts the same strings as input as the setPageSize() diff --git a/kviewshell/pageView.cpp b/kviewshell/pageView.cpp index 060f2d15..6dad756b 100644 --- a/kviewshell/pageView.cpp +++ b/kviewshell/pageView.cpp @@ -30,8 +30,8 @@ #include "pageView.h" #include "pageNumber.h" -PageView::PageView( TQWidget* tqparent, const char* name ) - : TQScrollView( tqparent, name, WStaticContents | WNoAutoErase) +PageView::PageView( TQWidget* parent, const char* name ) + : TQScrollView( parent, name, WStaticContents | WNoAutoErase) { moveTool = true; diff --git a/kviewshell/pageView.h b/kviewshell/pageView.h index 06995e45..637a7e23 100644 --- a/kviewshell/pageView.h +++ b/kviewshell/pageView.h @@ -40,7 +40,7 @@ class PageView : public TQScrollView TQ_OBJECT public: - PageView( TQWidget* tqparent = 0, const char* name = 0 ); + PageView( TQWidget* parent = 0, const char* name = 0 ); ~PageView() {} void addChild( TQPtrVector<DocumentWidget> *wdgList ); diff --git a/kviewshell/plugins/djvu/djvumultipage.cpp b/kviewshell/plugins/djvu/djvumultipage.cpp index eca33115..ea78a48c 100644 --- a/kviewshell/plugins/djvu/djvumultipage.cpp +++ b/kviewshell/plugins/djvu/djvumultipage.cpp @@ -47,9 +47,9 @@ typedef KParts::GenericFactory<DjVuMultiPage> DjVuMultiPageFactory; K_EXPORT_COMPONENT_FACTORY(djvuviewpart, DjVuMultiPageFactory) -DjVuMultiPage::DjVuMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, +DjVuMultiPage::DjVuMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList&) - : KMultiPage(parentWidget, widgetName, tqparent, name), djvuRenderer(parentWidget) + : KMultiPage(parentWidget, widgetName, parent, name), djvuRenderer(parentWidget) { /* This is kparts wizardry that cannot be understood by man. Simply change the names to match your implementation. */ diff --git a/kviewshell/plugins/djvu/djvumultipage.h b/kviewshell/plugins/djvu/djvumultipage.h index eaad8a53..31fcd34c 100644 --- a/kviewshell/plugins/djvu/djvumultipage.h +++ b/kviewshell/plugins/djvu/djvumultipage.h @@ -96,7 +96,7 @@ public: kmultipage. Please have a look at the constructor's source code to see how to adjust this for your implementation. */ - DjVuMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, + DjVuMultiPage(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& args = TQStringList()); /** Destructor diff --git a/kviewshell/plugins/djvu/djvurenderer.cpp b/kviewshell/plugins/djvu/djvurenderer.cpp index a7af2ebf..b5aabcd1 100644 --- a/kviewshell/plugins/djvu/djvurenderer.cpp +++ b/kviewshell/plugins/djvu/djvurenderer.cpp @@ -62,7 +62,7 @@ DjVuRenderer::DjVuRenderer(TQWidget* par) : DocumentRenderer(par) { #ifdef KF_DEBUG - kdError() << "DjVuRenderer( tqparent=" << par << " )" << endl; + kdError() << "DjVuRenderer( parent=" << par << " )" << endl; #endif PPMstream = ByteStream::create(); diff --git a/kviewshell/plugins/djvu/djvurenderer.h b/kviewshell/plugins/djvu/djvurenderer.h index 31d69e83..12f34125 100644 --- a/kviewshell/plugins/djvu/djvurenderer.h +++ b/kviewshell/plugins/djvu/djvurenderer.h @@ -58,7 +58,7 @@ public: This constructor simply prints a message and calls the default constructor. */ - DjVuRenderer(TQWidget* tqparent); + DjVuRenderer(TQWidget* parent); /** Destructor diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp index 0a32ed95..2fe05a8b 100644 --- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp +++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.cpp @@ -29,8 +29,8 @@ #include "kprintDialogPage_DJVUconversionoptions.h" #include "kprintDialogPage_DJVUconversionoptions_basewidget.h" -KPrintDialogPage_DJVUConversionOptions::KPrintDialogPage_DJVUConversionOptions( TQWidget *tqparent, const char *name ) - : KPrintDialogPage( tqparent, name ) +KPrintDialogPage_DJVUConversionOptions::KPrintDialogPage_DJVUConversionOptions( TQWidget *parent, const char *name ) + : KPrintDialogPage( parent, name ) { setTitle( i18n("DJVU to PS Conversion") ); diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.h b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.h index f9ff0c14..c1ec4b3c 100644 --- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.h +++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUconversionoptions.h @@ -34,7 +34,7 @@ class kprintDialogPage_DJVUconversionoptions_basewidget; class KPrintDialogPage_DJVUConversionOptions : public KPrintDialogPage { public: - KPrintDialogPage_DJVUConversionOptions( TQWidget *tqparent = 0, const char *name = 0 ); + KPrintDialogPage_DJVUConversionOptions( TQWidget *parent = 0, const char *name = 0 ); void getOptions( TQMap<TQString,TQString>& opts, bool incldef = false ); void setOptions( const TQMap<TQString,TQString>& opts ); diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp index f93d6b0f..4b5e633a 100644 --- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp +++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.cpp @@ -28,8 +28,8 @@ #include "kprintDialogPage_DJVUpageoptions.h" -KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions( TQWidget *tqparent, const char *name ) - : KPrintDialogPage( tqparent, name ) +KPrintDialogPage_DJVUPageOptions::KPrintDialogPage_DJVUPageOptions( TQWidget *parent, const char *name ) + : KPrintDialogPage( parent, name ) { setTitle( i18n("Page Size & Placement") ); diff --git a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.h b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.h index fb6493e9..5bb5833e 100644 --- a/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.h +++ b/kviewshell/plugins/djvu/kprintDialogPage_DJVUpageoptions.h @@ -25,7 +25,7 @@ class TQCheckBox; class KPrintDialogPage_DJVUPageOptions : public KPrintDialogPage { public: - KPrintDialogPage_DJVUPageOptions( TQWidget *tqparent = 0, const char *name = 0 ); + KPrintDialogPage_DJVUPageOptions( TQWidget *parent = 0, const char *name = 0 ); void getOptions( TQMap<TQString,TQString>& opts, bool incldef = false ); void setOptions( const TQMap<TQString,TQString>& opts ); diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp index 62a07442..67223e1f 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocEditor.cpp @@ -468,7 +468,7 @@ DjVuDocEditor::insert_file(const GURL &file_url, const GUTF8String &parent_id, // Strip any INCL chunks file_pool=strip_incl_chunks(file_pool); - // Check if tqparent ID is valid + // Check if parent ID is valid GP<DjVmDir::File> parent_frec(dir->id_to_file(parent_id)); if (!parent_frec) parent_frec=dir->name_to_file(parent_id); @@ -499,7 +499,7 @@ DjVuDocEditor::insert_file(const GURL &file_url, const GUTF8String &parent_id, files_map[id]=f; } - // And insert it into the tqparent DjVuFile + // And insert it into the parent DjVuFile parent_file->insert_file(id, chunk_num); return id; @@ -966,7 +966,7 @@ DjVuDocEditor::remove_file(const GUTF8String &id, bool remove_unref, GMap<GUTF8String, void *> & ref_map) // Private function, which will remove file with ID id. // - // If will also remove all INCL chunks in tqparent files pointing + // If will also remove all INCL chunks in parent files pointing // to this one // // Finally, if remove_unref is TRUE, we will go down the files @@ -982,9 +982,9 @@ DjVuDocEditor::remove_file(const GUTF8String &id, bool remove_unref, for(GPosition pos=*parents;pos;++pos) { const GUTF8String parent_id((*parents).key(pos)); - const GP<DjVuFile> tqparent(get_djvu_file(parent_id)); - if (tqparent) - tqparent->unlink_file(id); + const GP<DjVuFile> parent(get_djvu_file(parent_id)); + if (parent) + parent->unlink_file(id); } delete parents; parents=0; diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp index 51da0692..3b33d943 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.cpp @@ -1391,12 +1391,12 @@ DjVuDocument::add_to_cache(const GP<DjVuFile> & f) void DjVuDocument::notify_file_flags_changed(const DjVuFile * source, - long set_tqmask, long clr_tqmask) + long set_mask, long clr_mask) { // Don't check here if the document is initialized or not. // This function may be called when it's not. // check(); - if (set_tqmask & DjVuFile::DECODE_OK) + if (set_mask & DjVuFile::DECODE_OK) { set_file_aliases(source); if (cache) add_to_cache((DjVuFile *) source); @@ -1414,7 +1414,7 @@ DjVuDocument::notify_file_flags_changed(const DjVuFile * source, process_threqs(); } - if (set_tqmask & DjVuFile::DATA_PRESENT) + if (set_mask & DjVuFile::DATA_PRESENT) process_threqs(); // May be we can extract thumbnails now } diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.h b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.h index 91ab849b..418d0814 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuDocument.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuDocument.h @@ -800,7 +800,7 @@ public: virtual GP<DjVuFile> id_to_file(const DjVuPort * source, const GUTF8String &id); virtual GP<DataPool> request_data(const DjVuPort * source, const GURL & url); virtual void notify_file_flags_changed(const DjVuFile * source, - long set_tqmask, long clr_tqmask); + long set_mask, long clr_mask); virtual GList<GURL> get_url_names(void); virtual void set_recover_errors(ErrorRecoveryAction=ABORT); diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp index 564cdb0c..862c5fd0 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuFile.cpp @@ -398,10 +398,10 @@ DjVuFile::notify_chunk_done(const DjVuPort *, const GUTF8String &) void DjVuFile::notify_file_flags_changed(const DjVuFile * src, - long set_tqmask, long clr_tqmask) + long set_mask, long clr_mask) { check(); - if (set_tqmask & (DECODE_OK | DECODE_FAILED | DECODE_STOPPED)) + if (set_mask & (DECODE_OK | DECODE_FAILED | DECODE_STOPPED)) { // Signal threads waiting for file termination finish_mon.enter(); @@ -414,7 +414,7 @@ DjVuFile::notify_file_flags_changed(const DjVuFile * src, chunk_mon.leave(); } - if ((set_tqmask & ALL_DATA_PRESENT) && src!=this && + if ((set_mask & ALL_DATA_PRESENT) && src!=this && are_incl_files_created() && is_data_present()) { if (src!=this && are_incl_files_created() && is_data_present()) @@ -931,7 +931,7 @@ DjVuFile::decode_chunk( const GUTF8String &id, const GP<ByteStream> &gbs, desc.format( ERR_MSG("DjVuFile.tqshape_dict") "\t%d", fgjd->get_tqshape_count() ); } - // Sjbz (JB2 encoded tqmask) + // Sjbz (JB2 encoded mask) else if (chkid=="Sjbz" && (djvu || djvi)) { if (this->fgjb) @@ -943,19 +943,19 @@ DjVuFile::decode_chunk( const GUTF8String &id, const GP<ByteStream> &gbs, // ---- end hack fgjb->decode(gbs, static_get_fgjd, (void*)this); this->fgjb = fgjb; - desc.format( ERR_MSG("DjVuFile.fg_tqmask") "\t%d\t%d\t%d", + desc.format( ERR_MSG("DjVuFile.fg_mask") "\t%d\t%d\t%d", fgjb->get_width(), fgjb->get_height(), get_dpi(fgjb->get_width(), fgjb->get_height())); } - // Smmr (MMR-G4 encoded tqmask) + // Smmr (MMR-G4 encoded mask) else if (chkid=="Smmr" && (djvu || djvi)) { if (this->fgjb) G_THROW( ERR_MSG("DjVuFile.dupl_Sxxx") ); set_can_compress(true); this->fgjb = MMRDecoder::decode(gbs); - desc.format( ERR_MSG("DjVuFile.G4_tqmask") "\t%d\t%d\t%d", + desc.format( ERR_MSG("DjVuFile.G4_mask") "\t%d\t%d\t%d", fgjb->get_width(), fgjb->get_height(), get_dpi(fgjb->get_width(), fgjb->get_height())); } diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuFile.h b/kviewshell/plugins/djvu/libdjvu/DjVuFile.h index 6f81c8e4..e81ef2d5 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuFile.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuFile.h @@ -215,9 +215,9 @@ public: GP<IW44Image> bg44; /// Pointer to the background component of DjVu image (Raw). GP<GPixmap> bgpm; - /// Pointer to the tqmask of foreground component of DjVu image (JB2 encoded). + /// Pointer to the mask of foreground component of DjVu image (JB2 encoded). GP<JB2Image> fgjb; - /// Pointer to the optional tqshape dictionary for the tqmask (JB2 encoded). + /// Pointer to the optional tqshape dictionary for the mask (JB2 encoded). GP<JB2Dict> fgjd; /// Pointer to a colors layer for the foreground component of DjVu image. GP<GPixmap> fgpm; @@ -610,7 +610,7 @@ public: virtual bool inherits(const GUTF8String &class_name) const; virtual void notify_chunk_done(const DjVuPort * source, const GUTF8String &name); virtual void notify_file_flags_changed(const DjVuFile * source, - long set_tqmask, long clr_tqmask); + long set_mask, long clr_mask); virtual void set_recover_errors(const ErrorRecoveryAction=ABORT); virtual void set_verbose_eof(const bool verbose_eof=true); virtual void report_error(const GException &ex,const bool=true); diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp index 772583ec..b31b04bf 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.cpp @@ -142,7 +142,7 @@ DjVuProgressTask::set_callback(djvu_progress_callback *_callback) } DjVuProgressTask::DjVuProgressTask(const char *xtask,int nsteps) - : task(xtask),tqparent(0), nsteps(nsteps), runtostep(0), gdata(0), data(0) + : task(xtask),parent(0), nsteps(nsteps), runtostep(0), gdata(0), data(0) { // gtask=task; { @@ -158,7 +158,7 @@ DjVuProgressTask::DjVuProgressTask(const char *xtask,int nsteps) startdate = curdate; if (!d.head) d.lastsigdate = curdate + INITIAL; - tqparent = d.head; + parent = d.head; d.head = this; } } @@ -171,8 +171,8 @@ DjVuProgressTask::~DjVuProgressTask() { if (data->head != this) G_THROW( ERR_MSG("DjVuGlobal.not_compatible") ); - data->head = tqparent; - if (!tqparent) + data->head = parent; + if (!parent) { unsigned long curdate = GOS::ticks(); if((*(data->callback))(data->gtask?data->gtask:"",curdate-startdate, curdate-startdate)) @@ -210,9 +210,9 @@ DjVuProgressTask::signal(unsigned long curdate, unsigned long estdate) { const unsigned long enddate = startdate+ (unsigned long)(((float)(estdate-startdate) * (float)nsteps) / (float)inprogress); - if (tqparent) + if (parent) { - tqparent->signal(curdate, enddate); + parent->signal(curdate, enddate); } else if (data && data->callback && curdate<enddate) { diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.h b/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.h index 1e52d698..3d26c8cf 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuGlobal.h @@ -268,7 +268,7 @@ public: const char *task; static djvu_progress_callback *set_callback(djvu_progress_callback *ptr=0); private: - DjVuProgressTask *tqparent; + DjVuProgressTask *parent; int nsteps; int runtostep; unsigned long startdate; diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuImage.h b/kviewshell/plugins/djvu/libdjvu/DjVuImage.h index 30fc9898..84c9165d 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuImage.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuImage.h @@ -185,13 +185,13 @@ public: function returns a null pointer until the decoder actually processes an #"BGjp"# chunk. */ GP<GPixmap> get_bgpm() const; - /** Returns a pointer to the tqmask of the foreground component of a DjVu - image. The tqmask of the foreground component is always a JB2 image in + /** Returns a pointer to the mask of the foreground component of a DjVu + image. The mask of the foreground component is always a JB2 image in this implementation. This function returns a null pointer until the decoder actually processes an #"Sjbz"# chunk. */ GP<JB2Image> get_fgjb() const; /** Returns a pointer to the colors of the foreground component of a DjVu - image. The tqmask of the foreground component is always a small pixmap in + image. The mask of the foreground component is always a small pixmap in this implementation. This function returns a null pointer until the decoder actually processes an #"FG44"# chunk. */ GP<GPixmap> get_fgpm() const; @@ -284,7 +284,7 @@ public: \begin{verbatim} DJVU Image (2325x3156) version 17: 0.0 Kb 'INFO' Page information. - 17.3 Kb 'Sjbz' JB2 foreground tqmask (2325x3156) + 17.3 Kb 'Sjbz' JB2 foreground mask (2325x3156) 2.5 Kb 'BG44' IW44 background (775x1052) 1.0 Kb 'FG44' IW44 foreground colors (194x263) 3.0 Kb 'BG44' IW44 background (part 2). @@ -318,7 +318,7 @@ public: /** This function returns true if this object contains a well formed {\em Bilevel DjVu Image}. Calling function #get_bitmap# on a well formed bilevel image should always return a non zero value. Note that function - #get_bitmap# works as soon as a foreground tqmask component is present, + #get_bitmap# works as soon as a foreground mask component is present, regardless of the fact that the image follows the rules or not. */ int is_legal_bilevel() const; /** This function returns true if this object contains a well formed {\em @@ -351,7 +351,7 @@ public: This function returns a null pointer if there is not enough information in the DjVu image to properly render the desired image. */ GP<GPixmap> get_pixmap(const GRect &rect, const GRect &all, double gamma=0) const; - /** Renders the tqmask of the foreground layer of the DjVu image. This + /** Renders the mask of the foreground layer of the DjVu image. This functions is a wrapper for \Ref{JB2Image::get_bitmap}. Argument #align# specified the tqalignment of the rows of the returned images. Setting #align# to #4#, for instance, will adjust the bitmap border in order to diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp index a3f11bd0..4e49fe12 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp @@ -107,7 +107,7 @@ fmin(float a, float b) DjVuPalette::DjVuPalette() - : tqmask(0), hist(0), pmap(0) + : mask(0), hist(0), pmap(0) { } @@ -124,7 +124,7 @@ DjVuPalette::operator=(const DjVuPalette &ref) { delete hist; delete pmap; - tqmask = 0; + mask = 0; palette = ref.palette; colordata = ref.colordata; } @@ -132,7 +132,7 @@ DjVuPalette::operator=(const DjVuPalette &ref) } DjVuPalette::DjVuPalette(const DjVuPalette &ref) - : tqmask(0), hist(0), pmap(0) + : mask(0), hist(0), pmap(0) { this->operator=(ref); } @@ -147,18 +147,18 @@ DjVuPalette::allocate_hist() if (! hist) { hist = new GMap<int,int>; - tqmask = 0; + mask = 0; } else { GMap<int,int> *old = hist; hist = new GMap<int,int>; - tqmask = (tqmask<<1)|(0x010101); + mask = (mask<<1)|(0x010101); for (GPosition p = *old; p; ++p) { int k = old->key(p); int w = (*old)[p]; - (*hist)[k | tqmask] += w; + (*hist)[k | mask] += w; } delete old; } @@ -540,7 +540,7 @@ DjVuPalette::decode(GP<ByteStream> gbs) delete pmap; hist = 0; pmap = 0; - tqmask = 0; + mask = 0; // Code version int version = bs.read8(); if ( (version & 0x7f) != DJVUPALETTEVERSION) diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h index 1195bf5a..7f9884f1 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.h @@ -210,7 +210,7 @@ public: private: // Histogram - int tqmask; + int mask; GMap<int,int> *hist; // Quantization data struct PColor { unsigned char p[4]; }; @@ -240,7 +240,7 @@ DjVuPalette::histogram_clear() { delete hist; hist = 0; - tqmask = 0; + mask = 0; } inline void @@ -250,7 +250,7 @@ DjVuPalette::histogram_add(const unsigned char *bgr, int weight) { if (!hist || hist->size()>=0x4000) allocate_hist(); - int key = (bgr[0]<<16)|(bgr[1]<<8)|(bgr[2])|(tqmask); + int key = (bgr[0]<<16)|(bgr[1]<<8)|(bgr[2])|(mask); (*hist)[key] += weight; } } @@ -271,7 +271,7 @@ DjVuPalette::histogram_norm_and_add(const int *bgr, int weight) int p2 = bgr[2]/weight; if (p2>255) p2=255; if (!hist || hist->size()>=0x4000) allocate_hist(); - int key = (p0<<16)|(p1<<8)|(p2)|(tqmask); + int key = (p0<<16)|(p1<<8)|(p2)|(mask); (*hist)[key] += weight; } } diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp index 16b873ba..8cf9b967 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuPort.cpp @@ -576,22 +576,22 @@ DjVuPortcaster::notify_chunk_done(const DjVuPort * source, const GUTF8String &na void DjVuPortcaster::notify_file_flags_changed(const DjVuFile * source, - long set_tqmask, long clr_tqmask) + long set_mask, long clr_mask) { GPList<DjVuPort> list; compute_closure(source, list); for(GPosition pos=list; pos; ++pos) - list[pos]->notify_file_flags_changed(source, set_tqmask, clr_tqmask); + list[pos]->notify_file_flags_changed(source, set_mask, clr_mask); } void DjVuPortcaster::notify_doc_flags_changed(const DjVuDocument * source, - long set_tqmask, long clr_tqmask) + long set_mask, long clr_mask) { GPList<DjVuPort> list; compute_closure(source, list); for(GPosition pos=list; pos; ++pos) - list[pos]->notify_doc_flags_changed(source, set_tqmask, clr_tqmask); + list[pos]->notify_doc_flags_changed(source, set_mask, clr_mask); } void diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPort.h b/kviewshell/plugins/djvu/libdjvu/DjVuPort.h index 430b7842..3e63c901 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuPort.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuPort.h @@ -230,20 +230,20 @@ public: \end{itemize} @param source \Ref{DjVuFile}, which flags have been changed - @param set_tqmask bits, which have been set - @param clr_tqmask bits, which have been cleared */ + @param set_mask bits, which have been set + @param clr_mask bits, which have been cleared */ virtual void notify_file_flags_changed(const class DjVuFile * source, - long set_tqmask, long clr_tqmask); + long set_mask, long clr_mask); /** This notification is sent after the \Ref{DjVuDocument} flags have been changed. This happens, for example, after it receives enough data and can determine its structure (#BUNDLED#, #OLD_INDEXED#, etc.). @param source \Ref{DjVuDocument}, which flags have been changed - @param set_tqmask bits, which have been set - @param clr_tqmask bits, which have been cleared */ + @param set_mask bits, which have been set + @param clr_mask bits, which have been cleared */ virtual void notify_doc_flags_changed(const class DjVuDocument * source, - long set_tqmask, long clr_tqmask); + long set_mask, long clr_mask); /** This notification is sent from time to time while decoding is in progress. The purpose is obvious: to provide a way to know how much @@ -459,13 +459,13 @@ public: function in each of the ports from the destination list starting from the closest. */ virtual void notify_file_flags_changed(const class DjVuFile * source, - long set_tqmask, long clr_tqmask); + long set_mask, long clr_mask); /** Computes destination list for #source# and calls the corresponding function in each of the ports from the destination list starting from the closest. */ virtual void notify_doc_flags_changed(const class DjVuDocument * source, - long set_tqmask, long clr_tqmask); + long set_mask, long clr_mask); /** Computes destination list for #source# and calls the corresponding function in each of the ports from the destination list starting from diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp index c6606a48..6b460864 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuText.cpp @@ -183,14 +183,14 @@ DjVuTXT::Zone::memuse() const #ifndef NEED_DECODER_ONLY void DjVuTXT::Zone::encode( - const GP<ByteStream> &gbs, const Zone * tqparent, const Zone * prev) const + const GP<ByteStream> &gbs, const Zone * parent, const Zone * prev) const { ByteStream &bs=*gbs; // Encode type bs.write8(ztype); // Modify text_start and bounding rectangle based on the context - // (whether there is a previous non-zero same-level-child or tqparent) + // (whether there is a previous non-zero same-level-child or parent) int start=text_start; int x=rect.xmin, y=rect.ymin; int width=rect.width(), height=rect.height(); @@ -212,13 +212,13 @@ DjVuTXT::Zone::encode( y=y-prev->rect.ymin; } start-=prev->text_start+prev->text_length; - } else if (tqparent) + } else if (parent) { - // Encode offset from the upper left corner of the tqparent + // Encode offset from the upper left corner of the parent // in the coord system in that corner with x to the right and y down - x=x-tqparent->rect.xmin; - y=tqparent->rect.ymax-(y+height); - start-=tqparent->text_start; + x=x-parent->rect.xmin; + y=parent->rect.ymax-(y+height); + start-=parent->text_start; } // Encode rectangle bs.write16(0x8000+x); @@ -243,7 +243,7 @@ DjVuTXT::Zone::encode( void DjVuTXT::Zone::decode(const GP<ByteStream> &gbs, int maxtext, - const Zone * tqparent, const Zone * prev) + const Zone * parent, const Zone * prev) { ByteStream &bs=*gbs; // Decode type @@ -273,11 +273,11 @@ DjVuTXT::Zone::decode(const GP<ByteStream> &gbs, int maxtext, y=y+prev->rect.ymin; } text_start+=prev->text_start+prev->text_length; - } else if (tqparent) + } else if (parent) { - x=x+tqparent->rect.xmin; - y=tqparent->rect.ymax-(y+height); - text_start+=tqparent->text_start; + x=x+parent->rect.xmin; + y=parent->rect.ymax-(y+height); + text_start+=parent->text_start; } rect=GRect(x, y, width, height); // Get tqchildren size @@ -484,12 +484,12 @@ DjVuTXT::Zone::get_smallest(GList<GRect> &list, const int padding) const } void -DjVuTXT::get_zones(int zone_type, const Zone *tqparent, +DjVuTXT::get_zones(int zone_type, const Zone *parent, GList<Zone *> & zone_list) const - // get all the zones of type zone_type under zone node tqparent + // get all the zones of type zone_type under zone node parent { - // search all branches under tqparent - const Zone *zone=tqparent; + // search all branches under parent + const Zone *zone=parent; for( int cur_ztype=zone->ztype; cur_ztype<zone_type; ++cur_ztype ) { GPosition pos; diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuText.h b/kviewshell/plugins/djvu/libdjvu/DjVuText.h index 1db6da10..54708324 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuText.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuText.h @@ -148,10 +148,10 @@ public: /** Finds the smallest rectangles and appends them to the list. */ void get_smallest(GList<GRect> &list) const; /** Finds the smallest rectangles and appends them to the list after - padding the smallest unit to fit width or height for the tqparent rectangle + padding the smallest unit to fit width or height for the parent rectangle and adding the number of specified pixels. */ void get_smallest(GList<GRect> &list,const int padding) const; - /// Find out this Zone's tqparent. + /// Find out this Zone's parent. const Zone *get_parent(void) const; private: friend class DjVuTXT; @@ -161,9 +161,9 @@ public: unsigned int memuse() const; static const int version; void encode(const GP<ByteStream> &bs, - const Zone * tqparent=0, const Zone * prev=0) const; + const Zone * parent=0, const Zone * prev=0) const; void decode(const GP<ByteStream> &bs, int maxtext, - const Zone * tqparent=0, const Zone * prev=0); + const Zone * parent=0, const Zone * prev=0); }; /** Textual data for this page. The content of this string is encoded using the UTF8 code. @@ -207,9 +207,9 @@ public: GList<Zone*> find_text_in_rect(GRect target_rect, GUTF8String &text) const; /** Find the text specified by the rectangle. */ GList<GRect> find_text_with_rect(const GRect &box, GUTF8String &text, const int padding=0) const; - /** Get all zones of zone type zone_type under node tqparent. + /** Get all zones of zone type zone_type under node parent. zone_list contains the return value. */ - void get_zones(int zone_type, const Zone *tqparent, GList<Zone *> & zone_list) const; + void get_zones(int zone_type, const Zone *parent, GList<Zone *> & zone_list) const; /** Returns the number of bytes needed by this data structure. It's used by caching routines to estimate the size of a \Ref{DjVuImage}. */ unsigned int get_memory_usage() const; diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuToPS.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.cpp index a45a9112..618cb108 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuToPS.cpp +++ b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.cpp @@ -456,12 +456,12 @@ store_doc_setup(ByteStream &str) write(str, "%% -- procs for foreground layer\n" "/g {gsave 0 0 0 0 5 index 5 index setcachedevice\n" - " true [1 0 0 1 0 0] 5 4 roll imagetqmask grestore\n" + " true [1 0 0 1 0 0] 5 4 roll imagemask grestore\n" "} bind def\n" "/gn {gsave 0 0 0 0 6 index 6 index setcachedevice\n" " true [1 0 0 1 0 0] 3 2 roll 5 1 roll \n" " { 1 sub 0 index 2 add 1 index 1 add roll\n" - " } imagetqmask grestore pop \n" + " } imagemask grestore pop \n" "} bind def\n" "/c {setcolor rmoveto glyphshow} bind def\n" "/s {rmoveto glyphshow} bind def\n" @@ -1180,22 +1180,22 @@ print_fg(ByteStream &str, { unsigned char * row_bits = (*bitmap)[current_row]; unsigned char acc = 0; - unsigned char tqmask = 0; + unsigned char mask = 0; for(int current_col=0; current_col<columns; current_col++) { - if (tqmask == 0) - tqmask = 0x80; + if (mask == 0) + mask = 0x80; if (row_bits[current_col]) - acc |= tqmask; - tqmask >>= 1; - if (tqmask == 0) + acc |= mask; + mask >>= 1; + if (mask == 0) { *s=acc; s++; - acc = tqmask = 0; + acc = mask = 0; } } - if (tqmask != 0) + if (mask != 0) { *s=acc; s++; @@ -1584,16 +1584,16 @@ print_image_lev1(ByteStream &str, { unsigned char *pix = (*bm)[y]; unsigned char acc = 0; - unsigned char tqmask = 0; + unsigned char mask = 0; char *data; for (int x=grectBand.width(); x>0; x--, pix++) { - if (tqmask == 0) - tqmask = 0x80; + if (mask == 0) + mask = 0x80; if (! *pix) - acc |= tqmask; - tqmask >>= 1; - if (tqmask == 0) + acc |= mask; + mask >>= 1; + if (mask == 0) { data = bin2hex[acc]; acc = 0; @@ -1607,7 +1607,7 @@ print_image_lev1(ByteStream &str, } } } - if (tqmask != 0) + if (mask != 0) { data = bin2hex[acc]; *buf_ptr++ = data[0]; @@ -2230,10 +2230,10 @@ create(void) void DjVuToPS::DecodePort:: notify_file_flags_changed(const DjVuFile *source, - long set_tqmask, long clr_tqmask) + long set_mask, long clr_mask) { // WARNING! This function is called from another thread - if (set_tqmask & (DjVuFile::DECODE_OK | + if (set_mask & (DjVuFile::DECODE_OK | DjVuFile::DECODE_FAILED | DjVuFile::DECODE_STOPPED )) { diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h index 761b6e23..95d547bb 100644 --- a/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h +++ b/kviewshell/plugins/djvu/libdjvu/DjVuToPS.h @@ -121,7 +121,7 @@ public: would be your best choice. \item[Mode] ({\em COLOR}, {\em FORE}, {\em BACK}, or {\em BW}) Specifies how the \Ref{DjVuImage}s will be rendered (all layers, - foreground layer, background layer, and the tqmask respectively) + foreground layer, background layer, and the mask respectively) \item[Color] ({\em TRUE} or {\em FALSE}). Choosing {\em FALSE} converts color images to gray scale. \item[Gamma] Printer color correction. diff --git a/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp b/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp index 223a43e1..696367e7 100644 --- a/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GBitmap.cpp @@ -814,19 +814,19 @@ GBitmap::read_pbm_raw(ByteStream &bs) for (int n = nrows-1; n>=0; n--) { unsigned char acc = 0; - unsigned char tqmask = 0; + unsigned char mask = 0; for (int c = 0; c<ncolumns; c++) { - if (!tqmask) + if (!mask) { bs.read(&acc, 1); - tqmask = (unsigned char)0x80; + mask = (unsigned char)0x80; } - if (acc & tqmask) + if (acc & mask) row[c] = 1; else row[c] = 0; - tqmask >>= 1; + mask >>= 1; } row -= bytes_per_row; } @@ -1037,18 +1037,18 @@ GBitmap::rle_get_bitmap ( { const int obyte_def=invert?0xff:0; const int obyte_ndef=invert?0:0xff; - int tqmask=0x80,obyte=0; + int mask=0x80,obyte=0; for(int c=ncolumns;c > 0 ;) { int x=read_run(runs); c-=x; while((x--)>0) { - if(!(tqmask>>=1)) + if(!(mask>>=1)) { *(bitmap++) = obyte^obyte_def; obyte=0; - tqmask=0x80; + mask=0x80; for(;x>=8;x-=8) { *(bitmap++)=obyte_def; @@ -1061,19 +1061,19 @@ GBitmap::rle_get_bitmap ( c-=x; while((x--)>0) { - obyte|=tqmask; - if(!(tqmask>>=1)) + obyte|=mask; + if(!(mask>>=1)) { *(bitmap++)=obyte^obyte_def; obyte=0; - tqmask=0x80; + mask=0x80; for(;(x>8);x-=8) *(bitmap++)=obyte_ndef; } } } } - if(tqmask != 0x80) + if(mask != 0x80) { *(bitmap++)=obyte^obyte_def; } diff --git a/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp b/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp index a65f013b..973c6cec 100644 --- a/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GIFFManager.cpp @@ -180,13 +180,13 @@ GIFFChunk::add_chunk(const GP<GIFFChunk> & chunk, int position) if (!type.length()) { - DEBUG_MSG("Converting the tqparent to FORM\n"); + DEBUG_MSG("Converting the parent to FORM\n"); type="FORM"; } if (chunk->get_type()=="PROP") { - DEBUG_MSG("Converting the tqparent to LIST\n"); + DEBUG_MSG("Converting the parent to LIST\n"); type="LIST"; } diff --git a/kviewshell/plugins/djvu/libdjvu/GIFFManager.h b/kviewshell/plugins/djvu/libdjvu/GIFFManager.h index 716f66f9..722f592f 100644 --- a/kviewshell/plugins/djvu/libdjvu/GIFFManager.h +++ b/kviewshell/plugins/djvu/libdjvu/GIFFManager.h @@ -149,7 +149,7 @@ public: /** Returns the chunk with given {\em name}. The {\em name} may not contain dots, but MAY contain colons and brackets (the latter - for specifying the chunk number). If {\em position} is not zero - then the chunk position in its tqparent will be put into #*position# */ + then the chunk position in its parent will be put into #*position# */ GP<GIFFChunk>get_chunk(const GUTF8String &name, int * position=0); /** Returns the number of chunks with given {\em name}. The {\em name} may not contain dots and brackets. If {\em name} is ZERO, the @@ -233,10 +233,10 @@ GIFFChunk::GIFFChunk(const GUTF8String &name, const TArray<char> & data_in) : \item You may use {\em brackets} in the name to specify the chunk's position. The meaning of the number inside the brackets depends on the function you call. In most of the cases this is the number - of the chunk with the given name in the tqparent chunk. But sometimes + of the chunk with the given name in the parent chunk. But sometimes (as in #addChunk(name, buffer, length)#) the brackets at the end of the #name# actually specify the {\em position} of the - chunk in the tqparent. For example, to insert #INCL# chunk into + chunk in the parent. For example, to insert #INCL# chunk into #DJVU# form at position #1# (make it the second) you may want to use #manager.addChunk(".DJVU.INCL[1]", data, size)#. At the same time, to get 2-nd chunk with name #BG44# from form #DJVU# you @@ -332,7 +332,7 @@ public: /** Returns the chunk with name {\em name}. The {\em name} may contain dots colons and slashes. If {\em position} is not zero, #*position# will - be assigned the position of the found chunk in the tqparent chunk. + be assigned the position of the found chunk in the parent chunk. {\bf Examples:} \begin{verbatim} diff --git a/kviewshell/plugins/djvu/libdjvu/GPixmap.h b/kviewshell/plugins/djvu/libdjvu/GPixmap.h index afbd3512..32d51c7e 100644 --- a/kviewshell/plugins/djvu/libdjvu/GPixmap.h +++ b/kviewshell/plugins/djvu/libdjvu/GPixmap.h @@ -306,13 +306,13 @@ public: #Alpha# denotes the gray value, in range #[0,1]#, represented by the corresponding pixel of bitmap #bm#. */ void attenuate(const GBitmap *bm, int x, int y); - /** Blits solid color #color# through transparency tqmask #bm#. + /** Blits solid color #color# through transparency mask #bm#. Bitmap #bm# is positionned at location #x#,#y# over this color image. The matching color image pixels are then modified by adding color #color# multiplied by #Alpha#, where #Alpha# denotes the gray value, in range #[0,1]#, represented by the corresponding pixel of bitmap #bm#. */ void blit(const GBitmap *bm, int x, int y, const GPixel *color); - /** Blits pixmap #color# through transparency tqmask #bm#. + /** Blits pixmap #color# through transparency mask #bm#. Bitmap #bm# is positionned at location #x#,#y# over this color image. The matching color image pixels are then modified by adding the corresponding pixel color in pixmap #color#, multiplied by #Alpha#, diff --git a/kviewshell/plugins/djvu/libdjvu/GThreads.cpp b/kviewshell/plugins/djvu/libdjvu/GThreads.cpp index fa924324..ce88361e 100644 --- a/kviewshell/plugins/djvu/libdjvu/GThreads.cpp +++ b/kviewshell/plugins/djvu/libdjvu/GThreads.cpp @@ -1837,16 +1837,16 @@ GSafeFlags::operator long(void) const } bool -GSafeFlags::test_and_modify(long set_tqmask, long clr_tqmask, - long set_tqmask1, long clr_tqmask1) +GSafeFlags::test_and_modify(long set_mask, long clr_mask, + long set_mask1, long clr_mask1) { enter(); - if ((flags & set_tqmask)==set_tqmask && - (~flags & clr_tqmask)==clr_tqmask) + if ((flags & set_mask)==set_mask && + (~flags & clr_mask)==clr_mask) { long new_flags=flags; - new_flags|=set_tqmask1; - new_flags&=~clr_tqmask1; + new_flags|=set_mask1; + new_flags&=~clr_mask1; if (new_flags!=flags) { flags=new_flags; @@ -1860,15 +1860,15 @@ GSafeFlags::test_and_modify(long set_tqmask, long clr_tqmask, } void -GSafeFlags::wait_and_modify(long set_tqmask, long clr_tqmask, - long set_tqmask1, long clr_tqmask1) +GSafeFlags::wait_and_modify(long set_mask, long clr_mask, + long set_mask1, long clr_mask1) { enter(); - while((flags & set_tqmask)!=set_tqmask || - (~flags & clr_tqmask)!=clr_tqmask) wait(); + while((flags & set_mask)!=set_mask || + (~flags & clr_mask)!=clr_mask) wait(); long new_flags=flags; - new_flags|=set_tqmask1; - new_flags&=~clr_tqmask1; + new_flags|=set_mask1; + new_flags&=~clr_mask1; if (flags!=new_flags) { flags=new_flags; diff --git a/kviewshell/plugins/djvu/libdjvu/GThreads.h b/kviewshell/plugins/djvu/libdjvu/GThreads.h index 2235e2b6..92691db4 100644 --- a/kviewshell/plugins/djvu/libdjvu/GThreads.h +++ b/kviewshell/plugins/djvu/libdjvu/GThreads.h @@ -516,36 +516,36 @@ public: /** Returns the value of the flags */ operator long(void) const; - /** Modifies the flags by ORing them with the provided tqmask. A broadcast + /** Modifies the flags by ORing them with the provided mask. A broadcast will be sent after the modification is done. */ - GSafeFlags & operator|=(long tqmask); - /** Modifies the flags by ANDing them with the provided tqmask. A broadcast + GSafeFlags & operator|=(long mask); + /** Modifies the flags by ANDing them with the provided mask. A broadcast will be sent after the modification is done. */ - GSafeFlags & operator&=(long tqmask); + GSafeFlags & operator&=(long mask); - /** If all bits mentioned in #set_tqmask# are set in the flags and all - bits mentioned in #clr_tqmask# are cleared in the flags, it sets all - bits from #set_tqmask1# in the flags, clears all flags from - #clr_tqmask1# in the flags and returns #TRUE#. Otherwise returns + /** If all bits mentioned in #set_mask# are set in the flags and all + bits mentioned in #clr_mask# are cleared in the flags, it sets all + bits from #set_mask1# in the flags, clears all flags from + #clr_mask1# in the flags and returns #TRUE#. Otherwise returns #FALSE#. */ - bool test_and_modify(long set_tqmask, long clr_tqmask, - long set_tqmask1, long clr_tqmask1); + bool test_and_modify(long set_mask, long clr_mask, + long set_mask1, long clr_mask1); - /** Waits until all bits mentioned in #set_tqmask# are set in the flags + /** Waits until all bits mentioned in #set_mask# are set in the flags and all bits mentioned in #clr_flags# are cleared in the flags. - After that it sets bits from #set_tqmask1# and clears bits from - #clr_tqmask1# in the flags. */ - void wait_and_modify(long set_tqmask, long clr_tqmask, - long set_tqmask1, long clr_tqmask1); + After that it sets bits from #set_mask1# and clears bits from + #clr_mask1# in the flags. */ + void wait_and_modify(long set_mask, long clr_mask, + long set_mask1, long clr_mask1); - /** Waits until all bits set in #set_tqmask# are set in the flags and - all bits mentioned in #clr_tqmask# are cleared in the flags. */ - void wait_for_flags(long set_tqmask, long clr_tqmask=0) const; + /** Waits until all bits set in #set_mask# are set in the flags and + all bits mentioned in #clr_mask# are cleared in the flags. */ + void wait_for_flags(long set_mask, long clr_mask=0) const; - /** Modifies the flags by setting all bits mentioned in #set_tqmask# - and clearing all bits mentioned in #clr_tqmask#. If the flags have + /** Modifies the flags by setting all bits mentioned in #set_mask# + and clearing all bits mentioned in #clr_mask#. If the flags have actually been modified, a broadcast will be sent. */ - void modify(long set_tqmask, long clr_tqmask); + void modify(long set_mask, long clr_mask); }; inline @@ -555,28 +555,28 @@ GSafeFlags::GSafeFlags(long xflags) } inline void -GSafeFlags::wait_for_flags(long set_tqmask, long clr_tqmask) const +GSafeFlags::wait_for_flags(long set_mask, long clr_mask) const { - ((GSafeFlags *) this)->wait_and_modify(set_tqmask, clr_tqmask, 0, 0); + ((GSafeFlags *) this)->wait_and_modify(set_mask, clr_mask, 0, 0); } inline void -GSafeFlags::modify(long set_tqmask, long clr_tqmask) +GSafeFlags::modify(long set_mask, long clr_mask) { - test_and_modify(0, 0, set_tqmask, clr_tqmask); + test_and_modify(0, 0, set_mask, clr_mask); } inline GSafeFlags & -GSafeFlags::operator|=(long tqmask) +GSafeFlags::operator|=(long mask) { - test_and_modify(0, 0, tqmask, 0); + test_and_modify(0, 0, mask, 0); return *this; } inline GSafeFlags & -GSafeFlags::operator&=(long tqmask) +GSafeFlags::operator&=(long mask) { - test_and_modify(0, 0, 0, ~tqmask); + test_and_modify(0, 0, 0, ~mask); return *this; } diff --git a/kviewshell/plugins/djvu/libdjvu/IFFByteStream.cpp b/kviewshell/plugins/djvu/libdjvu/IFFByteStream.cpp index 59f729b4..c8b79809 100644 --- a/kviewshell/plugins/djvu/libdjvu/IFFByteStream.cpp +++ b/kviewshell/plugins/djvu/libdjvu/IFFByteStream.cpp @@ -444,7 +444,7 @@ IFFByteStream::full_id(GUTF8String &chkid) short_id(chkid); if (ctx->bComposite) return; - // Search tqparent FORM or PROP chunk. + // Search parent FORM or PROP chunk. for (IFFContext *ct = ctx->next; ct; ct=ct->next) if (memcmp(ct->idOne, "FOR", 3)==0 || memcmp(ct->idOne, "PRO", 3)==0 ) diff --git a/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp b/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp index 2a4d4035..c63eda7d 100644 --- a/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp +++ b/kviewshell/plugins/djvu/libdjvu/IW44EncodeCodec.cpp @@ -160,9 +160,9 @@ public: Encode(void); /** Initializes an IWBitmap with image #bm#. This constructor performs the wavelet decomposition of image #bm# and records the - corresponding wavelet coefficient. Argument #tqmask# is an optional + corresponding wavelet coefficient. Argument #mask# is an optional bilevel image specifying the masked pixels (see \Ref{IW44Image.h}). */ - void init(const GBitmap &bm, const GP<GBitmap> tqmask=0); + void init(const GBitmap &bm, const GP<GBitmap> mask=0); // CODER /** Encodes one data chunk into ByteStream #bs#. Parameter #parms# controls how much data is generated. The chunk data is written to ByteStream @@ -211,11 +211,11 @@ public: Encode(void); /** Initializes an IWPixmap with color image #bm#. This constructor performs the wavelet decomposition of image #bm# and records the - corresponding wavelet coefficient. Argument #tqmask# is an optional + corresponding wavelet coefficient. Argument #mask# is an optional bilevel image specifying the masked pixels (see \Ref{IW44Image.h}). Argument #crcbmode# specifies how the chrominance information should be encoded (see \Ref{CRCBMode}). */ - void init(const GPixmap &bm, const GP<GBitmap> tqmask=0, CRCBMode crcbmode=CRCBnormal); + void init(const GPixmap &bm, const GP<GBitmap> mask=0, CRCBMode crcbmode=CRCBnormal); // CODER /** Encodes one data chunk into ByteStream #bs#. Parameter #parms# controls how much data is generated. The chunk data is written to ByteStream @@ -720,17 +720,17 @@ IW44Image::Transform::Encode::RGB_to_Cr(const GPixel *p, int w, int h, int rowsi static void -interpolate_tqmask(short *data16, int w, int h, int rowsize, - const signed char *tqmask8, int mskrowsize) +interpolate_mask(short *data16, int w, int h, int rowsize, + const signed char *mask8, int mskrowsize) { int i,j; // count masked bits short *count; GPBuffer<short> gcount(count,w*h); short *cp = count; - for (i=0; i<h; i++, cp+=w, tqmask8+=mskrowsize) + for (i=0; i<h; i++, cp+=w, mask8+=mskrowsize) for (j=0; j<w; j++) - cp[j] = (tqmask8[j] ? 0 : 0x1000); + cp[j] = (mask8[j] ? 0 : 0x1000); // copy image short *sdata; GPBuffer<short> gsdata(sdata,w*h); @@ -820,8 +820,8 @@ interpolate_tqmask(short *data16, int w, int h, int rowsize, static void -forward_tqmask(short *data16, int w, int h, int rowsize, int begin, int end, - const signed char *tqmask8, int mskrowsize ) +forward_mask(short *data16, int w, int h, int rowsize, int begin, int end, + const signed char *mask8, int mskrowsize ) { int i,j; signed char *m; @@ -830,12 +830,12 @@ forward_tqmask(short *data16, int w, int h, int rowsize, int begin, int end, // Allocate buffers short *sdata; GPBuffer<short> gsdata(sdata,w*h); - signed char *stqmask; - GPBuffer<signed char> gstqmask(stqmask,w*h); - // Copy tqmask - m = stqmask; - for (i=0; i<h; i+=1, m+=w, tqmask8+=mskrowsize) - memcpy((void*)m, (void*)tqmask8, w); + signed char *smask; + GPBuffer<signed char> gsmask(smask,w*h); + // Copy mask + m = smask; + for (i=0; i<h; i+=1, m+=w, mask8+=mskrowsize) + memcpy((void*)m, (void*)mask8, w); // Loop over scale for (int scale=begin; scale<end; scale<<=1) { @@ -853,7 +853,7 @@ forward_tqmask(short *data16, int w, int h, int rowsize, int begin, int end, IW44Image::Transform::Encode::forward(sdata, w, h, w, scale, scale+scale); // Cancel masked coefficients d = sdata; - m = stqmask; + m = smask; for (i=0; i<h; i+=scale+scale) { for (j=scale; j<w; j+=scale+scale) @@ -875,7 +875,7 @@ forward_tqmask(short *data16, int w, int h, int rowsize, int begin, int end, // Correct visible pixels p = data16; d = sdata; - m = stqmask; + m = smask; for (i=0; i<h; i+=scale) { for (j=0; j<w; j+=scale) @@ -897,8 +897,8 @@ forward_tqmask(short *data16, int w, int h, int rowsize, int begin, int end, p += rowsize * scale; d += w * scale; } - // Compute new tqmask for next scale - m = stqmask; + // Compute new mask for next scale + m = smask; signed char *m0 = m; signed char *m1 = m; for (i=0; i<h; i+=scale+scale) @@ -941,15 +941,15 @@ IW44Image::Map::Encode::create(const signed char *img8, int imgrowsize, for (i=ih; i<bh; i++) for (j=0; j<bw; j++) *p++ = 0; - // Handle bittqmask + // Handle bitmask if (msk8) { - // Interpolate pixels below tqmask + // Interpolate pixels below mask DJVU_PROGRESS_RUN(transf, 1); - interpolate_tqmask(data16, iw, ih, bw, msk8, mskrowsize); + interpolate_mask(data16, iw, ih, bw, msk8, mskrowsize); // Multiscale iterative masked decomposition DJVU_PROGRESS_RUN(transf, 3); - forward_tqmask(data16, iw, ih, bw, 1, 32, msk8, mskrowsize); + forward_mask(data16, iw, ih, bw, 1, 32, msk8, mskrowsize); } else { @@ -1393,11 +1393,11 @@ IW44Image::create_encode(const ImageType itype) } GP<IW44Image> -IW44Image::create_encode(const GBitmap &bm, const GP<GBitmap> tqmask) +IW44Image::create_encode(const GBitmap &bm, const GP<GBitmap> mask) { IWBitmap::Encode *bit=new IWBitmap::Encode(); GP<IW44Image> retval=bit; - bit->init(bm, tqmask); + bit->init(bm, mask); return retval; } @@ -1412,7 +1412,7 @@ IWBitmap::Encode::~Encode() } void -IWBitmap::Encode::init(const GBitmap &bm, const GP<GBitmap> gtqmask) +IWBitmap::Encode::init(const GBitmap &bm, const GP<GBitmap> gmask) { // Free close_codec(); @@ -1430,14 +1430,14 @@ IWBitmap::Encode::init(const GBitmap &bm, const GP<GBitmap> gtqmask) for (i=0; i<256; i++) bconv[i] = max(0,min(255,i*255/g)) - 128; // Perform decomposition - // Prepare tqmask information + // Prepare mask information const signed char *msk8 = 0; int mskrowsize = 0; - GBitmap *tqmask=gtqmask; - if (gtqmask) + GBitmap *mask=gmask; + if (gmask) { - msk8 = (const signed char*)((*tqmask)[0]); - mskrowsize = tqmask->rowsize(); + msk8 = (const signed char*)((*mask)[0]); + mskrowsize = mask->rowsize(); } // Prepare a buffer of signed bytes for (i=0; i<h; i++) @@ -1556,11 +1556,11 @@ IWBitmap::Encode::encode_iff(IFFByteStream &iff, int nchunks, const IWEncoderPar GP<IW44Image> IW44Image::create_encode( - const GPixmap &pm, const GP<GBitmap> gtqmask, CRCBMode crcbmode) + const GPixmap &pm, const GP<GBitmap> gmask, CRCBMode crcbmode) { IWPixmap::Encode *pix=new IWPixmap::Encode(); GP<IW44Image> retval=pix; - pix->init(pm, gtqmask,(IWPixmap::Encode::CRCBMode)crcbmode); + pix->init(pm, gmask,(IWPixmap::Encode::CRCBMode)crcbmode); return retval; } @@ -1574,7 +1574,7 @@ IWPixmap::Encode::~Encode() } void -IWPixmap::Encode::init(const GPixmap &pm, const GP<GBitmap> gtqmask, CRCBMode crcbmode) +IWPixmap::Encode::init(const GPixmap &pm, const GP<GBitmap> gmask, CRCBMode crcbmode) { /* Free */ close_codec(); @@ -1598,14 +1598,14 @@ IWPixmap::Encode::init(const GPixmap &pm, const GP<GBitmap> gtqmask, CRCBMode cr case CRCBnormal: crcb_half=0; crcb_delay=10; break; case CRCBfull: crcb_half=0; crcb_delay= 0; break; } - // Prepare tqmask information + // Prepare mask information const signed char *msk8 = 0; int mskrowsize = 0; - GBitmap *tqmask=gtqmask; - if (tqmask) + GBitmap *mask=gmask; + if (mask) { - msk8 = (signed char const *)((*tqmask)[0]); - mskrowsize = tqmask->rowsize(); + msk8 = (signed char const *)((*mask)[0]); + mskrowsize = mask->rowsize(); } // Fill buffer with luminance information DJVU_PROGRESS_TASK(create,"initialize pixmap",3); diff --git a/kviewshell/plugins/djvu/libdjvu/IW44Image.cpp b/kviewshell/plugins/djvu/libdjvu/IW44Image.cpp index b4ca3405..4ddc297e 100644 --- a/kviewshell/plugins/djvu/libdjvu/IW44Image.cpp +++ b/kviewshell/plugins/djvu/libdjvu/IW44Image.cpp @@ -934,7 +934,7 @@ IW44Image::Codec::Codec(IW44Image::Map &xmap) IW44Image::Codec::~Codec() {} // is_null_slice -// -- check if data can be produced for this band/tqmask +// -- check if data can be produced for this band/mask // -- also fills the sure_zero array int diff --git a/kviewshell/plugins/djvu/libdjvu/IW44Image.h b/kviewshell/plugins/djvu/libdjvu/IW44Image.h index 0363a1fb..43c14be9 100644 --- a/kviewshell/plugins/djvu/libdjvu/IW44Image.h +++ b/kviewshell/plugins/djvu/libdjvu/IW44Image.h @@ -137,11 +137,11 @@ {\bf Masking} --- When we create a DjVu image, we often know that certain pixels of the background image are going to be covered by foreground objects like text or drawings. The DjVu IW44 wavelet decomposition - routine can use an optional bilevel image named the tqmask. Every non zero - pixel in the tqmask means the value of the corresponding pixel in the + routine can use an optional bilevel image named the mask. Every non zero + pixel in the mask means the value of the corresponding pixel in the background image is irrelevant. The wavelet decomposition code will replace these masked pixels by a color value whose coding cost is minimal - (see \URL{http://www.research.att.com/~leonb/DJVU/tqmask}). + (see \URL{http://www.research.att.com/~leonb/DJVU/mask}). {\bf ToDo} --- There are many improvements to be made. Besides better quantization algorithms (such as trellis quantization and bitrate @@ -277,16 +277,16 @@ public: virtual ~IW44Image(); /** Initializes an IWBitmap with image #bm#. This constructor performs the wavelet decomposition of image #bm# and records the - corresponding wavelet coefficient. Argument #tqmask# is an optional + corresponding wavelet coefficient. Argument #mask# is an optional bilevel image specifying the masked pixels (see \Ref{IW44Image.h}). */ - static GP<IW44Image> create_encode(const GBitmap &bm, const GP<GBitmap> tqmask=0); + static GP<IW44Image> create_encode(const GBitmap &bm, const GP<GBitmap> mask=0); /** Initializes an IWPixmap with color image #bm#. This constructor performs the wavelet decomposition of image #bm# and records the - corresponding wavelet coefficient. Argument #tqmask# is an optional + corresponding wavelet coefficient. Argument #mask# is an optional bilevel image specifying the masked pixels (see \Ref{IW44Image.h}). Argument #crcbmode# specifies how the chrominance information should be encoded (see \Ref{CRCBMode}). */ - static GP<IW44Image> create_encode(const GPixmap &bm, const GP<GBitmap> tqmask=0, CRCBMode crcbmode=CRCBnormal); + static GP<IW44Image> create_encode(const GPixmap &bm, const GP<GBitmap> mask=0, CRCBMode crcbmode=CRCBnormal); // ACCESS /** Returns the width of the IWBitmap image. */ int get_width(void) const; diff --git a/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp b/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp index 3ff9d7df..8abefffe 100644 --- a/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp +++ b/kviewshell/plugins/djvu/libdjvu/JB2EncodeCodec.cpp @@ -381,7 +381,7 @@ JB2Dict::JB2Codec::Encode::code(const GP<JB2Dict> &gjim) DJVU_PROGRESS_RUN(jb2code, (tqshapeno-firsttqshape)|0xff); // Code tqshape JB2Shape &jshp = jim.get_tqshape(tqshapeno); - rectype=(jshp.tqparent >= 0) + rectype=(jshp.parent >= 0) ?MATCHED_REFINE_LIBRARY_ONLY:NEW_MARK_LIBRARY_ONLY; code_record(rectype, gjim, &jshp); add_library(tqshapeno, jshp); @@ -423,7 +423,7 @@ JB2Dict::JB2Codec::Encode::code(const GP<JB2Image> &gjim) // Determine tqshapes that go into library (tqshapeno>=firsttqshape) // tqshape2lib is -2 if used by one blit // tqshape2lib is -3 if used by more than one blit - // tqshape2lib is -4 if used as a tqparent + // tqshape2lib is -4 if used as a parent for (i=0; i<nblit; i++) { JB2Blit *jblt = jim.get_blit(i); @@ -432,11 +432,11 @@ JB2Dict::JB2Codec::Encode::code(const GP<JB2Image> &gjim) continue; if (tqshape2lib[tqshapeno] >= -2) tqshape2lib[tqshapeno] -= 1; - tqshapeno = jim.get_tqshape(tqshapeno).tqparent; + tqshapeno = jim.get_tqshape(tqshapeno).parent; while (tqshapeno>=firsttqshape && tqshape2lib[tqshapeno]>=-3) { tqshape2lib[tqshapeno] = -4; - tqshapeno = jim.get_tqshape(tqshapeno).tqparent; + tqshapeno = jim.get_tqshape(tqshapeno).parent; } } // Code headers. @@ -468,13 +468,13 @@ JB2Dict::JB2Codec::Encode::code(const GP<JB2Image> &gjim) else if (jshp.bits) { // Make sure all parents have been coded - if (jshp.tqparent>=0 && tqshape2lib[jshp.tqparent]<0) - encode_libonly_tqshape(gjim, jshp.tqparent); + if (jshp.parent>=0 && tqshape2lib[jshp.parent]<0) + encode_libonly_tqshape(gjim, jshp.parent); // Allocate library entry when needed #define LIBRARY_CONTAINS_ALL int libraryp = 0; #ifdef LIBRARY_CONTAINS_MARKS // baseline - if (jshp.tqparent >= -1) + if (jshp.parent >= -1) libraryp = 1; #endif #ifdef LIBRARY_CONTAINS_SHARED // worse @@ -485,12 +485,12 @@ JB2Dict::JB2Codec::Encode::code(const GP<JB2Image> &gjim) libraryp = 1; #endif // Test all blit cases - if (jshp.tqparent<-1 && !libraryp) + if (jshp.parent<-1 && !libraryp) { int rectype = NON_MARK_DATA; code_record(rectype, gjim, &jshp, jblt); } - else if (jshp.tqparent < 0) + else if (jshp.parent < 0) { int rectype = (libraryp ? NEW_MARK : NEW_MARK_IMAGE_ONLY); code_record(rectype, gjim, &jshp, jblt); @@ -530,15 +530,15 @@ JB2Dict::JB2Codec::Encode::encode_libonly_tqshape( G_THROW( ERR_MSG("JB2Image.bad_number") ); } JB2Image &jim=*gjim; - // Recursively encode tqparent tqshape + // Recursively encode parent tqshape JB2Shape &jshp = jim.get_tqshape(tqshapeno); - if (jshp.tqparent>=0 && tqshape2lib[jshp.tqparent]<0) - encode_libonly_tqshape(gjim, jshp.tqparent); + if (jshp.parent>=0 && tqshape2lib[jshp.parent]<0) + encode_libonly_tqshape(gjim, jshp.parent); // Test that library tqshape must be encoded if (tqshape2lib[tqshapeno] < 0) { // Code library entry - int rectype=(jshp.tqparent >= 0) + int rectype=(jshp.parent >= 0) ?NEW_MARK_LIBRARY_ONLY:MATCHED_REFINE_LIBRARY_ONLY; code_record(rectype, gjim, &jshp, 0); // Add tqshape to library diff --git a/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp b/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp index d6644cbc..7cd8a46e 100644 --- a/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp +++ b/kviewshell/plugins/djvu/libdjvu/JB2Image.cpp @@ -220,7 +220,7 @@ JB2Dict::get_memory_usage() const int JB2Dict::add_tqshape(const JB2Shape &tqshape) { - if (tqshape.tqparent >= get_tqshape_count()) + if (tqshape.parent >= get_tqshape_count()) G_THROW( ERR_MSG("JB2Image.bad_parent_tqshape") ); int index = tqshapes.size(); tqshapes.touch(index); @@ -946,7 +946,7 @@ JB2Dict::JB2Codec::code_record( if (!encoding) { jshp.bits = GBitmap::create(); - jshp.tqparent = -1; + jshp.parent = -1; } bm = jshp.bits; break; @@ -982,11 +982,11 @@ JB2Dict::JB2Codec::code_record( } JB2Dict &jim=*gjim; JB2Shape &jshp=*xjshp; - int match = code_match_index (jshp.tqparent, jim); - cbm = jim.get_tqshape(jshp.tqparent).bits; + int match = code_match_index (jshp.parent, jim); + cbm = jim.get_tqshape(jshp.parent).bits; LibRect &l = libinfo[match]; code_relative_mark_size (*bm, l.right-l.left+1, l.top-l.bottom+1, 4); - code_bitmap_by_cross_coding (*bm, cbm, jshp.tqparent); + code_bitmap_by_cross_coding (*bm, cbm, jshp.parent); break; } case PRESERVED_COMMENT: @@ -1110,9 +1110,9 @@ JB2Dict::JB2Codec::code_record( if (!encoding) { jshp.bits = GBitmap::create(); - jshp.tqparent = -1; + jshp.parent = -1; if (rectype == NON_MARK_DATA) - jshp.tqparent = -2; + jshp.parent = -2; } bm = jshp.bits; break; @@ -1162,8 +1162,8 @@ JB2Dict::JB2Codec::code_record( } JB2Shape &jshp=*xjshp; JB2Image &jim=*gjim; - match = code_match_index (jshp.tqparent, jim); - cbm = jim.get_tqshape(jshp.tqparent).bits; + match = code_match_index (jshp.parent, jim); + cbm = jim.get_tqshape(jshp.parent).bits; LibRect &l = libinfo[match]; code_relative_mark_size (*bm, l.right-l.left+1, l.top-l.bottom+1, 4); code_bitmap_by_cross_coding (*bm, cbm, match); @@ -1178,8 +1178,8 @@ JB2Dict::JB2Codec::code_record( } JB2Image &jim=*gjim; JB2Shape &jshp=*xjshp; - match = code_match_index (jshp.tqparent, jim); - cbm = jim.get_tqshape(jshp.tqparent).bits; + match = code_match_index (jshp.parent, jim); + cbm = jim.get_tqshape(jshp.parent).bits; LibRect &l = libinfo[match]; code_relative_mark_size (*bm, l.right-l.left+1, l.top-l.bottom+1, 4); break; @@ -1192,8 +1192,8 @@ JB2Dict::JB2Codec::code_record( } JB2Image &jim=*gjim; JB2Shape &jshp=*xjshp; - match = code_match_index (jshp.tqparent, jim); - cbm = jim.get_tqshape(jshp.tqparent).bits; + match = code_match_index (jshp.parent, jim); + cbm = jim.get_tqshape(jshp.parent).bits; LibRect &l = libinfo[match]; code_relative_mark_size (*bm, l.right-l.left+1, l.top-l.bottom+1, 4); code_bitmap_by_cross_coding (*bm, cbm, match); diff --git a/kviewshell/plugins/djvu/libdjvu/JB2Image.h b/kviewshell/plugins/djvu/libdjvu/JB2Image.h index 95b7bf26..0cf9da47 100644 --- a/kviewshell/plugins/djvu/libdjvu/JB2Image.h +++ b/kviewshell/plugins/djvu/libdjvu/JB2Image.h @@ -89,9 +89,9 @@ Each blit instructs the decoder to render a particular tqshape at a specified position in the image. Some compression is already achieved because several blits can refer to the same tqshape. A tqshape can also - contain a pointer to a tqparent tqshape. Additional compression is achieved + contain a pointer to a parent tqshape. Additional compression is achieved when both tqshapes are similar because each tqshape is encoded using the - tqparent tqshape as a model. A #"O"# tqshape for instance could be a tqparent for + parent tqshape as a model. A #"O"# tqshape for instance could be a parent for both a #"C"# tqshape and a #"Q"# tqshape. {\bf JB2 Dictionary} --- Class \Ref{JB2Dict} is a peculiar kind of @@ -122,8 +122,8 @@ in the sequence of blits because this facilitates the prediction of the tqshape indices. \item Shapes should be compared to all previous tqshapes in the tqshape array. - The tqshape tqparent pointer should be set to a suitable tqparent tqshape if - such a tqparent tqshape exists. The tqparent tqshape should have almost the + The tqshape parent pointer should be set to a suitable parent tqshape if + such a parent tqshape exists. The parent tqshape should have almost the same size and the same pixels. \end{itemize} All this is quite easy to achieve in the case of an electronically @@ -209,20 +209,20 @@ public: /** Shape data structure. A #JB2Image# contains an array of #JB2Shape# data structures. Each array entry represents an elementary blob of ink such as a character or a segment of line art. Member #bits# points to a bilevel - image representing the tqshape pixels. Member #tqparent# is the subscript of - the tqparent tqshape. */ + image representing the tqshape pixels. Member #parent# is the subscript of + the parent tqshape. */ class JB2Shape { public: - /** Subscript of the tqparent tqshape. The tqparent tqshape must always be located + /** Subscript of the parent tqshape. The parent tqshape must always be located before the current tqshape in the tqshape array. A negative value indicates - that this shape.has no tqparent. Any negative values smaller than #-1# + that this shape.has no parent. Any negative values smaller than #-1# further indicates that this tqshape does not look like a character. This is used to enable a few internal optimizations. This information is - saved into the JB2 file, but the actual value of the #tqparent# variable + saved into the JB2 file, but the actual value of the #parent# variable is not. */ - int tqparent; + int parent; /** Bilevel image of the tqshape pixels. This must be a pointer to a bilevel #GBitmap# image. This pointer can also be null. The encoder will just silently discard all blits referring to a tqshape containing a null @@ -287,7 +287,7 @@ public: const JB2Shape &get_tqshape(const int tqshapeno) const; /** Appends a tqshape to the tqshape array. This function appends a copy of tqshape #tqshape# to the tqshape array and returns the subscript of the new - tqshape. The subscript of the tqparent tqshape #tqshape.tqparent# must + tqshape. The subscript of the parent tqshape #tqshape.parent# must actually designate an already existing tqshape. */ int add_tqshape(const JB2Shape &tqshape); diff --git a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp index eace389e..5d3d62ef 100644 --- a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp +++ b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.cpp @@ -937,7 +937,7 @@ MMRDecoder::decode(GP<ByteStream> gbs) tqshape.bits = blocks[b]; if (tqshape.bits) { - tqshape.tqparent = -1; + tqshape.parent = -1; tqshape.bits->compress(); JB2Blit blit; blit.left = b*blocksize; diff --git a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.h b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.h index 7340bfea..6516b4cd 100644 --- a/kviewshell/plugins/djvu/libdjvu/MMRDecoder.h +++ b/kviewshell/plugins/djvu/libdjvu/MMRDecoder.h @@ -81,9 +81,9 @@ class JB2Image; CCITT-G4/MMR decoder suitable for use in DjVu. The main entry point is function \Ref{MMRDecoder::decode}. - The foreground tqmask layer of a DjVu file is usually encoded with a + The foreground mask layer of a DjVu file is usually encoded with a #"Sjbz"# chunk containing JB2 encoded data (cf. \Ref{JB2Image.h}). - Alternatively, the qtqmask layer may be encoded with a #"Smmr"# + Alternatively, the qmask layer may be encoded with a #"Smmr"# chunk containing a small header followed by MMR encoded data. This encoding scheme produces significantly larger files. On the other hand, many scanners a printers talk MMR using very efficient diff --git a/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp b/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp index 77f3bec9..0c39a745 100644 --- a/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp +++ b/kviewshell/plugins/djvu/libdjvu/XMLParser.cpp @@ -782,10 +782,10 @@ static inline TYPE min(TYPE a,TYPE b) { return (a<b)?a:b; } // used to build the zone tree // true is returned if the GRect is known for this object, -// and false, if the rectangle's size is just the tqparent size. +// and false, if the rectangle's size is just the parent size. static bool make_child_layer( - DjVuTXT::Zone &tqparent, + DjVuTXT::Zone &parent, const lt_XMLTags &tag, ByteStream &bs, const int height, const double ws, const double hs) { @@ -799,32 +799,32 @@ make_child_layer( const GUTF8String name(tag.get_name()); if(name == wordtag) { - self_ptr=tqparent.append_child(); + self_ptr=parent.append_child(); self_ptr->ztype = DjVuTXT::WORD; sepchar=' '; }else if(name == linetag) { - self_ptr=tqparent.append_child(); + self_ptr=parent.append_child(); self_ptr->ztype = DjVuTXT::LINE; sepchar=DjVuTXT::end_of_line; }else if(name == paragraphtag) { - self_ptr=tqparent.append_child(); + self_ptr=parent.append_child(); self_ptr->ztype = DjVuTXT::PARAGRAPH; sepchar=DjVuTXT::end_of_paragraph; }else if(name == regiontag) { - self_ptr=tqparent.append_child(); + self_ptr=parent.append_child(); self_ptr->ztype = DjVuTXT::REGION; sepchar=DjVuTXT::end_of_region; }else if(name == pagecolumntag) { - self_ptr=tqparent.append_child(); + self_ptr=parent.append_child(); self_ptr->ztype = DjVuTXT::COLUMN; sepchar=DjVuTXT::end_of_column; }else { - self_ptr = &tqparent; + self_ptr = &parent; self_ptr->ztype = DjVuTXT::PAGE; sepchar=0; } @@ -833,10 +833,10 @@ make_child_layer( int &xmin=self.rect.xmin, &ymin=self.rect.ymin, &xmax=self.rect.xmax, &ymax=self.rect.ymax; GRect default_rect; - default_rect.xmin=max(tqparent.rect.xmax,tqparent.rect.xmin); - default_rect.xmax=min(tqparent.rect.xmax,tqparent.rect.xmin); - default_rect.ymin=max(tqparent.rect.ymax,tqparent.rect.ymin); - default_rect.ymax=min(tqparent.rect.ymax,tqparent.rect.ymin); + default_rect.xmin=max(parent.rect.xmax,parent.rect.xmin); + default_rect.xmax=min(parent.rect.xmax,parent.rect.xmin); + default_rect.ymin=max(parent.rect.ymax,parent.rect.ymin); + default_rect.ymax=min(parent.rect.ymax,parent.rect.ymin); // Now if there are coordinates, use those. GPosition pos(tag.get_args().contains("coords")); if(pos) @@ -926,7 +926,7 @@ make_child_layer( }else { // If the child doesn't have coordinates, we need to use a box - // at least as big as the tqparent's coordinates. + // at least as big as the parent's coordinates. xmin=min(save_rect.xmin,default_rect.xmax); xmax=max(save_rect.xmax,default_rect.xmin); ymin=min(save_rect.ymin,default_rect.ymax); @@ -952,10 +952,10 @@ make_child_layer( self.text_length = bs.tell() - self.text_start; } } - tqparent.rect.xmin=min(xmin,tqparent.rect.xmin); - tqparent.rect.ymin=min(ymin,tqparent.rect.ymin); - tqparent.rect.xmax=max(xmax,tqparent.rect.xmax); - tqparent.rect.ymax=max(ymax,tqparent.rect.ymax); + parent.rect.xmin=min(xmin,parent.rect.xmin); + parent.rect.ymin=min(ymin,parent.rect.ymin); + parent.rect.xmax=max(xmax,parent.rect.xmax); + parent.rect.ymax=max(ymax,parent.rect.ymax); if(xmin>xmax) { const int t=xmin; @@ -1029,11 +1029,11 @@ lt_XMLParser::Impl::ChangeText( const int h=info->height; const int w=info->width; txt->page_zone.text_start = 0; - DjVuTXT::Zone &tqparent=txt->page_zone; - tqparent.rect.xmin=0; - tqparent.rect.ymin=0; - tqparent.rect.ymax=h; - tqparent.rect.xmax=w; + DjVuTXT::Zone &parent=txt->page_zone; + parent.rect.xmin=0; + parent.rect.ymin=0; + parent.rect.ymax=h; + parent.rect.xmax=w; double ws=1.0; if(width && width != w) { @@ -1044,7 +1044,7 @@ lt_XMLParser::Impl::ChangeText( { hs=((double)h)/((double)height); } - make_child_layer(tqparent, tags, *textbs, h, ws,hs); + make_child_layer(parent, tags, *textbs, h, ws,hs); textbs->write8(0); long len = textbs->tell(); txt->page_zone.text_length = len; diff --git a/kviewshell/plugins/djvu/libdjvu/ZPCodec.h b/kviewshell/plugins/djvu/libdjvu/ZPCodec.h index 4e29fc74..4eba6901 100644 --- a/kviewshell/plugins/djvu/libdjvu/ZPCodec.h +++ b/kviewshell/plugins/djvu/libdjvu/ZPCodec.h @@ -716,7 +716,7 @@ ZPCodec::IWencoder(const bool bit) Adaptation on the other hand is a great simplification. A good data compression program must (a) represent the data in order to make its - predictability aptqparent, and (b) perform the predictions and generate the + predictability apparent, and (b) perform the predictions and generate the code bits. The ZP-Coder is an efficient and effortless solution for implementing task (b). diff --git a/kviewshell/plugins/djvu/pageRangeWidget.cpp b/kviewshell/plugins/djvu/pageRangeWidget.cpp index 1c1cb6fd..1d5c7be1 100644 --- a/kviewshell/plugins/djvu/pageRangeWidget.cpp +++ b/kviewshell/plugins/djvu/pageRangeWidget.cpp @@ -23,7 +23,7 @@ #include "pageRangeWidget.h" -PageRangeWidget::PageRangeWidget( TQ_UINT16 _from, TQ_UINT16 _to, TQ_UINT16 _current, TQWidget *tqparent, const char *name) : PageRangeWidget_base(tqparent, name) +PageRangeWidget::PageRangeWidget( TQ_UINT16 _from, TQ_UINT16 _to, TQ_UINT16 _current, TQWidget *parent, const char *name) : PageRangeWidget_base(parent, name) { // Paranoid security checks if ((from == 0) || (to == 0)) diff --git a/kviewshell/plugins/djvu/pageRangeWidget.h b/kviewshell/plugins/djvu/pageRangeWidget.h index a1d2ec58..7f2d267f 100644 --- a/kviewshell/plugins/djvu/pageRangeWidget.h +++ b/kviewshell/plugins/djvu/pageRangeWidget.h @@ -32,7 +32,7 @@ Q_OBJECT TQ_OBJECT public: - PageRangeWidget( TQ_UINT16 _from, TQ_UINT16 _to, TQ_UINT16 _current, TQWidget *tqparent = 0, const char *name = 0 ); + PageRangeWidget( TQ_UINT16 _from, TQ_UINT16 _to, TQ_UINT16 _current, TQWidget *parent = 0, const char *name = 0 ); TQ_UINT16 getFrom() const {return (from == 0) ? 0 : from->value(); } TQ_UINT16 getTo() const {return (to == 0) ? 0 : to->value(); } diff --git a/kviewshell/searchWidget.cpp b/kviewshell/searchWidget.cpp index 95d06295..d467249d 100644 --- a/kviewshell/searchWidget.cpp +++ b/kviewshell/searchWidget.cpp @@ -36,8 +36,8 @@ #include "searchWidget.h" -SearchWidget::SearchWidget(TQWidget* tqparent, const char* name, WFlags fl) - : TQWidget(tqparent, name, fl) +SearchWidget::SearchWidget(TQWidget* parent, const char* name, WFlags fl) + : TQWidget(parent, name, fl) { setName("SearchWidget"); diff --git a/kviewshell/searchWidget.h b/kviewshell/searchWidget.h index 189970ee..1445c22d 100644 --- a/kviewshell/searchWidget.h +++ b/kviewshell/searchWidget.h @@ -37,7 +37,7 @@ class SearchWidget : public TQWidget TQ_OBJECT public: - SearchWidget(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0); + SearchWidget(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0); ~SearchWidget(); TQString getText() const; diff --git a/kviewshell/sizePreview.cpp b/kviewshell/sizePreview.cpp index e3ba44df..0acd8843 100644 --- a/kviewshell/sizePreview.cpp +++ b/kviewshell/sizePreview.cpp @@ -18,8 +18,8 @@ #include "simplePageSize.h" -SizePreview::SizePreview( TQWidget *tqparent, const char *name, WFlags) - : TQWidget( tqparent, name, WStaticContents | WNoAutoErase ) +SizePreview::SizePreview( TQWidget *parent, const char *name, WFlags) + : TQWidget( parent, name, WStaticContents | WNoAutoErase ) { // Set a sane default _width = _height = 50.0; diff --git a/kviewshell/sizePreview.h b/kviewshell/sizePreview.h index aeaf264f..6963358d 100644 --- a/kviewshell/sizePreview.h +++ b/kviewshell/sizePreview.h @@ -22,7 +22,7 @@ class SizePreview : public TQWidget TQ_OBJECT public: - SizePreview( TQWidget *tqparent, const char* name=0, WFlags f=0 ); + SizePreview( TQWidget *parent, const char* name=0, WFlags f=0 ); public slots: // Sets the size. diff --git a/kviewshell/tableOfContents.cpp b/kviewshell/tableOfContents.cpp index 7003de53..51618d9a 100644 --- a/kviewshell/tableOfContents.cpp +++ b/kviewshell/tableOfContents.cpp @@ -28,19 +28,19 @@ #include "kvsprefs.h" -TocItem::TocItem(TocItem* tqparent) - : KListViewItem(tqparent) +TocItem::TocItem(TocItem* parent) + : KListViewItem(parent) { } -TocItem::TocItem(TQListView* tqparent) - : KListViewItem(tqparent) +TocItem::TocItem(TQListView* parent) + : KListViewItem(parent) { } -TableOfContents::TableOfContents(TQWidget* tqparent) - : KListView(tqparent) +TableOfContents::TableOfContents(TQWidget* parent) + : KListView(parent) { addColumn(i18n("Topic")); addColumn(i18n("Page")); @@ -79,7 +79,7 @@ void TableOfContents::setContents(const TQPtrList<Bookmark>& bookmarks) addItems(bookmarks); } -void TableOfContents::addItems(const TQPtrList<Bookmark>& _bookmarks, TocItem* tqparent) +void TableOfContents::addItems(const TQPtrList<Bookmark>& _bookmarks, TocItem* parent) { kdDebug(1223) << "TableOfContents::setContents()" << endl; if (_bookmarks.isEmpty()) @@ -90,10 +90,10 @@ void TableOfContents::addItems(const TQPtrList<Bookmark>& _bookmarks, TocItem* t TQPtrList<Bookmark> bookmarks = _bookmarks; for (Bookmark* current = bookmarks.last(); current; current = bookmarks.prev() ) { TocItem* item; - if (!tqparent) + if (!parent) item = new TocItem(this); else - item = new TocItem(tqparent); + item = new TocItem(parent); item->setText(0, current->bookmarkText); if (current->position.page != 0) diff --git a/kviewshell/tableOfContents.h b/kviewshell/tableOfContents.h index a6d4f311..cfa325b2 100644 --- a/kviewshell/tableOfContents.h +++ b/kviewshell/tableOfContents.h @@ -32,8 +32,8 @@ class Bookmark; class TocItem : public KListViewItem { public: - TocItem(TocItem* tqparent); - TocItem(TQListView* tqparent); + TocItem(TocItem* parent); + TocItem(TQListView* parent); void setAnchor(const Anchor & _anchor) { anchor = _anchor; } Anchor getAnchor() { return anchor; } @@ -49,7 +49,7 @@ Q_OBJECT TQ_OBJECT public: - TableOfContents(TQWidget* tqparent); + TableOfContents(TQWidget* parent); virtual ~TableOfContents(); void setContents(const TQPtrList<Bookmark>& bookmarks); @@ -61,7 +61,7 @@ signals: void gotoPage(const Anchor&); private: - void addItems(const TQPtrList<Bookmark>& bookmarks, TocItem* tqparent = 0); + void addItems(const TQPtrList<Bookmark>& bookmarks, TocItem* parent = 0); private slots: void itemClicked(TQListViewItem*); diff --git a/libkscan/devselector.cpp b/libkscan/devselector.cpp index bbed0f3b..97b06e54 100644 --- a/libkscan/devselector.cpp +++ b/libkscan/devselector.cpp @@ -41,9 +41,9 @@ #include "devselector.h" -DeviceSelector::DeviceSelector( TQWidget *tqparent, TQStrList& devList, +DeviceSelector::DeviceSelector( TQWidget *parent, TQStrList& devList, const TQStringList& hrdevList ) - : KDialogBase( tqparent, "DeviceSel", true, i18n("Welcome to Kooka"), + : KDialogBase( parent, "DeviceSel", true, i18n("Welcome to Kooka"), Ok|Cancel, Ok, true ) { kdDebug(29000) << "Starting DevSelector!" << endl; diff --git a/libkscan/devselector.h b/libkscan/devselector.h index ec74f343..de478285 100644 --- a/libkscan/devselector.h +++ b/libkscan/devselector.h @@ -58,11 +58,11 @@ class DeviceSelector: public KDialogBase public: /** * constructs the dialog class - * @param TQWidget *tqparent - the tqparent + * @param TQWidget *parent - the parent * @param TQStrList backends - a list of device names retrieved from the scan device * @param TQStrList scannerNames - a list of corresponding human readable sanner names. */ - DeviceSelector( TQWidget *tqparent, TQStrList&, const TQStringList& ); + DeviceSelector( TQWidget *parent, TQStrList&, const TQStringList& ); ~DeviceSelector(); /** diff --git a/libkscan/dispgamma.cpp b/libkscan/dispgamma.cpp index a2815276..bb10e8b5 100644 --- a/libkscan/dispgamma.cpp +++ b/libkscan/dispgamma.cpp @@ -22,7 +22,7 @@ #include "dispgamma.h" -DispGamma::DispGamma( TQWidget *tqparent ) : TQWidget( tqparent ) +DispGamma::DispGamma( TQWidget *parent ) : TQWidget( parent ) { vals = 0; margin = 10; diff --git a/libkscan/dispgamma.h b/libkscan/dispgamma.h index dca8840d..4b8fff45 100644 --- a/libkscan/dispgamma.h +++ b/libkscan/dispgamma.h @@ -37,7 +37,7 @@ class DispGamma : public TQWidget { Q_OBJECT TQ_OBJECT public: - DispGamma( TQWidget *tqparent ); + DispGamma( TQWidget *parent ); ~DispGamma(); TQSize tqsizeHint( void ); diff --git a/libkscan/gammadialog.cpp b/libkscan/gammadialog.cpp index b61a3388..e1147b10 100644 --- a/libkscan/gammadialog.cpp +++ b/libkscan/gammadialog.cpp @@ -29,8 +29,8 @@ #include "gammadialog.h" -GammaDialog::GammaDialog( TQWidget *tqparent ) : - KDialogBase( tqparent, "GammaDialog", true, i18n("Custom Gamma Tables"), +GammaDialog::GammaDialog( TQWidget *parent ) : + KDialogBase( parent, "GammaDialog", true, i18n("Custom Gamma Tables"), Ok|Cancel|Apply, Ok, true ) { gt = new KGammaTable(); diff --git a/libkscan/gammadialog.h b/libkscan/gammadialog.h index a4edea12..619e103b 100644 --- a/libkscan/gammadialog.h +++ b/libkscan/gammadialog.h @@ -46,7 +46,7 @@ class GammaDialog : public KDialogBase // TQ_PROPERTY( KGammaTable *gt READ getGt WRITE setGt ) public: - GammaDialog ( TQWidget *tqparent ); + GammaDialog ( TQWidget *parent ); ~GammaDialog( ); KGammaTable *getGt( ) const { return gt; } diff --git a/libkscan/img_canvas.cpp b/libkscan/img_canvas.cpp index 1ecc7970..b510f55d 100644 --- a/libkscan/img_canvas.cpp +++ b/libkscan/img_canvas.cpp @@ -72,10 +72,10 @@ public: TQValueList<TQRect> highlightRects; }; -ImageCanvas::ImageCanvas(TQWidget *tqparent, +ImageCanvas::ImageCanvas(TQWidget *parent, const TQImage *start_image, const char *name ): - TQScrollView( tqparent, name ), + TQScrollView( parent, name ), m_contextMenu(0) { d = new ImageCanvasPrivate(); diff --git a/libkscan/img_canvas.h b/libkscan/img_canvas.h index b99cb630..eac68e75 100644 --- a/libkscan/img_canvas.h +++ b/libkscan/img_canvas.h @@ -82,7 +82,7 @@ class ImageCanvas: public TQScrollView TQ_PROPERTY( int scale_factor READ getScaleFactor WRITE setScaleFactor ) public: - ImageCanvas( TQWidget *tqparent = 0, + ImageCanvas( TQWidget *parent = 0, const TQImage *start_image = 0, const char *name = 0); ~ImageCanvas( ); diff --git a/libkscan/imgscaledialog.cpp b/libkscan/imgscaledialog.cpp index 85c793e3..f6319a5b 100644 --- a/libkscan/imgscaledialog.cpp +++ b/libkscan/imgscaledialog.cpp @@ -27,9 +27,9 @@ /* ############################################################################## */ -ImgScaleDialog::ImgScaleDialog( TQWidget *tqparent, int curr_sel, +ImgScaleDialog::ImgScaleDialog( TQWidget *parent, int curr_sel, const char *name ) - :KDialogBase( tqparent, name , true, i18n("Zoom"), + :KDialogBase( parent, name , true, i18n("Zoom"), Ok|Cancel, Ok, true ) { // setCaption (i18n ("Image Zoom")); diff --git a/libkscan/imgscaledialog.h b/libkscan/imgscaledialog.h index 78c62b43..b6a947ed 100644 --- a/libkscan/imgscaledialog.h +++ b/libkscan/imgscaledialog.h @@ -36,7 +36,7 @@ class ImgScaleDialog : public KDialogBase TQ_PROPERTY( int selected READ getSelected WRITE setSelValue ) public: - ImgScaleDialog( TQWidget *tqparent, int curr_sel = 100, + ImgScaleDialog( TQWidget *parent, int curr_sel = 100, const char *name = 0 ); public slots: diff --git a/libkscan/kscandevice.cpp b/libkscan/kscandevice.cpp index 3aa8571e..a654a075 100644 --- a/libkscan/kscandevice.cpp +++ b/libkscan/kscandevice.cpp @@ -109,7 +109,7 @@ KScanOption *KScanDevice::getExistingGuiElement( const TQCString& name ) ------------------------------------------------------------------------- */ -KScanOption *KScanDevice::getGuiElement( const TQCString& name, TQWidget *tqparent, +KScanOption *KScanDevice::getGuiElement( const TQCString& name, TQWidget *parent, const TQString& desc, const TQString& tooltip ) { @@ -132,7 +132,7 @@ KScanOption *KScanDevice::getGuiElement( const TQCString& name, TQWidget *tqpare /** store new gui-elem in list of all gui-elements */ gui_elements.append( so ); - w = so->createWidget( tqparent, desc, tooltip ); + w = so->createWidget( parent, desc, tooltip ); if( w ) { connect( so, TQT_SIGNAL( optionChanged( KScanOption* ) ), @@ -163,8 +163,8 @@ KScanOption *KScanDevice::getGuiElement( const TQCString& name, TQWidget *tqpare // --------------------------------------------------------------------------- -KScanDevice::KScanDevice( TQObject *tqparent ) - : TQObject( tqparent ) +KScanDevice::KScanDevice( TQObject *parent ) + : TQObject( parent ) { SANE_Status sane_stat = sane_init(NULL, NULL ); diff --git a/libkscan/kscandevice.h b/libkscan/kscandevice.h index 06a28cfa..7cf8471b 100644 --- a/libkscan/kscandevice.h +++ b/libkscan/kscandevice.h @@ -76,7 +76,7 @@ public: * */ - KScanDevice( TQObject *tqparent = 0 ); + KScanDevice( TQObject *parent = 0 ); /** * Destructor @@ -246,11 +246,11 @@ public: * KScanOption. It is internally connected to the scan device, every * change to the widget is automaticly considered by the scan device. * @param name: Name of the SANE Option - * @param tqparent: pointer to the tqparent widget + * @param parent: pointer to the parent widget * @param desc: pointer to the text appearing as widget text * @param tooltip: tooltip text. If zero, the SANE text will be used. **/ - KScanOption *getGuiElement( const TQCString& name, TQWidget *tqparent, + KScanOption *getGuiElement( const TQCString& name, TQWidget *parent, const TQString& desc = TQString(), const TQString& tooltip = TQString() ); @@ -423,7 +423,7 @@ private: KScanStat createNewImage( SANE_Parameters *p ); // not implemented -// TQWidget *entryField( TQWidget *tqparent, const TQString& text, +// TQWidget *entryField( TQWidget *parent, const TQString& text, // const TQString& tooltip ); KScanStat find_options(); // help fct. to process options KScanStat acquire_data( bool isPreview = false ); diff --git a/libkscan/kscanoption.cpp b/libkscan/kscanoption.cpp index 247ed05c..43b35d0b 100644 --- a/libkscan/kscanoption.cpp +++ b/libkscan/kscanoption.cpp @@ -317,15 +317,15 @@ void KScanOption::slRedrawWidget( KScanOption *so ) break; case GAMMA_TABLE: /* Widget Type is GammaTable */ - // w = new TQSlider( tqparent, "AUTO_GAMMA" ); + // w = new TQSlider( parent, "AUTO_GAMMA" ); break; case STR_LIST: - // w = comboBox( tqparent, text ); + // w = comboBox( parent, text ); ((KScanCombo*)w)->slSetEntry( so->get() ); /* Widget Type is Selection Box */ break; case STRING: - // w = entryField( tqparent, text ); + // w = entryField( parent, text ); ((KScanEntry*)w)->slSetEntry( so->get() ); /* Widget Type is Selection Box */ break; @@ -1059,7 +1059,7 @@ bool KScanOption::getRange( double *min, double *max, double *q ) const return( ret ); } -TQWidget *KScanOption::createWidget( TQWidget *tqparent, const TQString& w_desc, +TQWidget *KScanOption::createWidget( TQWidget *parent, const TQString& w_desc, const TQString& tooltip ) { TQStrList list; @@ -1084,7 +1084,7 @@ TQWidget *KScanOption::createWidget( TQWidget *tqparent, const TQString& w_desc, { case BOOL: /* Widget Type is ToggleButton */ - w = new TQCheckBox( text, tqparent, "AUTO_TOGGLE_BUTTON" ); + w = new TQCheckBox( text, parent, "AUTO_TOGGLE_BUTTON" ); connect( w, TQT_SIGNAL(clicked()), this, TQT_SLOT(slWidgetChange())); break; @@ -1095,20 +1095,20 @@ TQWidget *KScanOption::createWidget( TQWidget *tqparent, const TQString& w_desc, break; case RANGE: /* Widget Type is Slider */ - w = KSaneSlider( tqparent, text ); + w = KSaneSlider( parent, text ); break; case GAMMA_TABLE: /* Widget Type is Slider */ - // w = KSaneSlider( tqparent, text ); + // w = KSaneSlider( parent, text ); kdDebug(29000) << "can not create widget for GAMMA_TABLE!" << endl; w = 0; // No widget, needs to be a set ! break; case STR_LIST: - w = comboBox( tqparent, text ); + w = comboBox( parent, text ); /* Widget Type is Selection Box */ break; case STRING: - w = entryField( tqparent, text ); + w = entryField( parent, text ); /* Widget Type is Selection Box */ break; default: @@ -1137,11 +1137,11 @@ TQWidget *KScanOption::createWidget( TQWidget *tqparent, const TQString& w_desc, } -TQWidget *KScanOption::comboBox( TQWidget *tqparent, const TQString& text ) +TQWidget *KScanOption::comboBox( TQWidget *parent, const TQString& text ) { TQStrList list = getList(); - KScanCombo *cb = new KScanCombo( tqparent, text, list); + KScanCombo *cb = new KScanCombo( parent, text, list); connect( cb, TQT_SIGNAL( valueChanged( const TQCString& )), this, TQT_SLOT( slWidgetChange( const TQCString& ))); @@ -1150,9 +1150,9 @@ TQWidget *KScanOption::comboBox( TQWidget *tqparent, const TQString& text ) } -TQWidget *KScanOption::entryField( TQWidget *tqparent, const TQString& text ) +TQWidget *KScanOption::entryField( TQWidget *parent, const TQString& text ) { - KScanEntry *ent = new KScanEntry( tqparent, text ); + KScanEntry *ent = new KScanEntry( parent, text ); connect( ent, TQT_SIGNAL( valueChanged( TQCString )), this, TQT_SLOT( slWidgetChange( TQCString ))); @@ -1160,12 +1160,12 @@ TQWidget *KScanOption::entryField( TQWidget *tqparent, const TQString& text ) } -TQWidget *KScanOption::KSaneSlider( TQWidget *tqparent, const TQString& text ) +TQWidget *KScanOption::KSaneSlider( TQWidget *parent, const TQString& text ) { double min, max, quant; getRange( &min, &max, &quant ); - KScanSlider *slider = new KScanSlider( tqparent, text, min, max ); + KScanSlider *slider = new KScanSlider( parent, text, min, max ); /* Connect to the options change Slot */ connect( slider, TQT_SIGNAL( valueChanged(int)), this, TQT_SLOT( slWidgetChange(int))); diff --git a/libkscan/kscanoption.h b/libkscan/kscanoption.h index d26ddd10..5a4e4271 100644 --- a/libkscan/kscanoption.h +++ b/libkscan/kscanoption.h @@ -149,7 +149,7 @@ public: * **/ - TQWidget *createWidget( TQWidget *tqparent, + TQWidget *createWidget( TQWidget *parent, const TQString& w_desc = TQString(), const TQString& tooltip = TQString() ); @@ -238,9 +238,9 @@ private: bool initOption( const TQCString& new_name ); void *allocBuffer( long ); - TQWidget *entryField ( TQWidget *tqparent, const TQString& text ); - TQWidget *KSaneSlider( TQWidget *tqparent, const TQString& text ); - TQWidget *comboBox ( TQWidget *tqparent, const TQString& text ); + TQWidget *entryField ( TQWidget *parent, const TQString& text ); + TQWidget *KSaneSlider( TQWidget *parent, const TQString& text ); + TQWidget *comboBox ( TQWidget *parent, const TQString& text ); const SANE_Option_Descriptor *desc; TQCString name; diff --git a/libkscan/kscanslider.cpp b/libkscan/kscanslider.cpp index 1712f2be..742a0bb6 100644 --- a/libkscan/kscanslider.cpp +++ b/libkscan/kscanslider.cpp @@ -31,10 +31,10 @@ #include <kdebug.h> #include "kscanslider.h" -KScanSlider::KScanSlider( TQWidget *tqparent, const TQString& text, +KScanSlider::KScanSlider( TQWidget *parent, const TQString& text, double min, double max, bool haveStdButt, int stdValue ) - : TQFrame( tqparent ), + : TQFrame( parent ), m_stdValue( stdValue ), m_stdButt(0) { @@ -149,8 +149,8 @@ KScanSlider::~KScanSlider() /* ====================================================================== */ -KScanEntry::KScanEntry( TQWidget *tqparent, const TQString& text ) - : TQFrame( tqparent ) +KScanEntry::KScanEntry( TQWidget *parent, const TQString& text ) + : TQFrame( parent ) { TQHBoxLayout *hb = new TQHBoxLayout( this ); @@ -213,9 +213,9 @@ void KScanEntry::slReturnPressed( void ) -KScanCombo::KScanCombo( TQWidget *tqparent, const TQString& text, +KScanCombo::KScanCombo( TQWidget *parent, const TQString& text, const TQStrList& list ) - : TQHBox( tqparent ), + : TQHBox( parent ), combo(0) { createCombo( text ); @@ -224,9 +224,9 @@ KScanCombo::KScanCombo( TQWidget *tqparent, const TQString& text, combolist = list; } -KScanCombo::KScanCombo( TQWidget *tqparent, const TQString& text, +KScanCombo::KScanCombo( TQWidget *parent, const TQString& text, const TQStringList& list ) - : TQHBox( tqparent ), + : TQHBox( parent ), combo(0) { createCombo( text ); diff --git a/libkscan/kscanslider.h b/libkscan/kscanslider.h index 30fc6464..b7d9a27e 100644 --- a/libkscan/kscanslider.h +++ b/libkscan/kscanslider.h @@ -52,7 +52,7 @@ public: /** * Create the slider. * - * @param tqparent tqparent widget + * @param parent parent widget * @param text is the text describing the the slider value. If the text * contains a '&', a buddy for the slider will be created. * @param min minimum slider value @@ -61,7 +61,7 @@ public: * appears on the left of the slider. * @param stdValue the value to which the standard button resets the slider. */ - KScanSlider( TQWidget *tqparent, const TQString& text, + KScanSlider( TQWidget *parent, const TQString& text, double min, double max, bool haveStdButt=false, int stdValue=0); /** @@ -124,10 +124,10 @@ class KScanEntry : public TQFrame public: /** * create a new entry field prepended by text. - * @param tqparent the tqparent widget + * @param parent the parent widget * @text the prefix text */ - KScanEntry( TQWidget *tqparent, const TQString& text ); + KScanEntry( TQWidget *parent, const TQString& text ); // ~KScanEntry(); /** @@ -179,12 +179,12 @@ public: /** * create a combobox with prepended text. * - * @param tqparent tqparent widget + * @param parent parent widget * @param text the text the combobox is prepended by * @param list a stringlist with values the list should contain. */ - KScanCombo( TQWidget *tqparent, const TQString& text, const TQStrList& list ); - KScanCombo( TQWidget *tqparent, const TQString& text, const TQStringList& list ); + KScanCombo( TQWidget *parent, const TQString& text, const TQStrList& list ); + KScanCombo( TQWidget *parent, const TQString& text, const TQStringList& list ); // ~KScanCombo(); /** diff --git a/libkscan/massscandialog.cpp b/libkscan/massscandialog.cpp index 372d2a7c..9d4a5f91 100644 --- a/libkscan/massscandialog.cpp +++ b/libkscan/massscandialog.cpp @@ -30,8 +30,8 @@ #include "massscandialog.h" -MassScanDialog::MassScanDialog( TQWidget *tqparent ) - :TQDialog( tqparent, "MASS_SCAN", true ) +MassScanDialog::MassScanDialog( TQWidget *parent ) + :TQDialog( parent, "MASS_SCAN", true ) { setCaption( i18n( "ADF Scanning" )); kdDebug(29000) << "Starting MassScanDialog!" << endl; diff --git a/libkscan/massscandialog.h b/libkscan/massscandialog.h index 1cd68153..479913a8 100644 --- a/libkscan/massscandialog.h +++ b/libkscan/massscandialog.h @@ -35,7 +35,7 @@ class MassScanDialog : public TQDialog Q_OBJECT TQ_OBJECT public: - MassScanDialog( TQWidget *tqparent); + MassScanDialog( TQWidget *parent); ~MassScanDialog(); public slots: diff --git a/libkscan/previewer.cpp b/libkscan/previewer.cpp index 5fde3f06..0e6c8804 100644 --- a/libkscan/previewer.cpp +++ b/libkscan/previewer.cpp @@ -106,8 +106,8 @@ public: TQMemArray<long> m_widthSum; }; -Previewer::Previewer(TQWidget *tqparent, const char *name ) - : TQWidget(tqparent,name) +Previewer::Previewer(TQWidget *parent, const char *name ) + : TQWidget(parent,name) { d = new PreviewerPrivate(); diff --git a/libkscan/previewer.h b/libkscan/previewer.h index 45a270ea..b1400e3a 100644 --- a/libkscan/previewer.h +++ b/libkscan/previewer.h @@ -45,7 +45,7 @@ class Previewer : public TQWidget Q_OBJECT TQ_OBJECT public: - Previewer(TQWidget *tqparent=0, const char *name=0); + Previewer(TQWidget *parent=0, const char *name=0); ~Previewer(); ImageCanvas *getImageCanvas( void ){ return( img_canvas ); } diff --git a/libkscan/scandialog.cpp b/libkscan/scandialog.cpp index bc9a7854..8d762272 100644 --- a/libkscan/scandialog.cpp +++ b/libkscan/scandialog.cpp @@ -51,25 +51,25 @@ extern "C" { } } -ScanDialogFactory::ScanDialogFactory( TQObject *tqparent, const char *name ) - : KScanDialogFactory( tqparent, name ) +ScanDialogFactory::ScanDialogFactory( TQObject *parent, const char *name ) + : KScanDialogFactory( parent, name ) { setName( "ScanDialogFactory" ); KGlobal::locale()->insertCatalogue( TQString::tqfromLatin1("libkscan") ); } -KScanDialog * ScanDialogFactory::createDialog( TQWidget *tqparent, +KScanDialog * ScanDialogFactory::createDialog( TQWidget *parent, const char *name, bool modal) { - return new ScanDialog( tqparent, name, modal ); + return new ScanDialog( parent, name, modal ); } /////////////////////////////////////////////////////////////////// -ScanDialog::ScanDialog( TQWidget *tqparent, const char *name, bool modal ) - : KScanDialog( Tabbed, Close|Help, tqparent, name, modal ), +ScanDialog::ScanDialog( TQWidget *parent, const char *name, bool modal ) + : KScanDialog( Tabbed, Close|Help, parent, name, modal ), good_scan_connect(false) { TQVBox *page = addVBoxPage( i18n("&Scanning") ); diff --git a/libkscan/scandialog.h b/libkscan/scandialog.h index 5077f050..1069e816 100644 --- a/libkscan/scandialog.h +++ b/libkscan/scandialog.h @@ -35,7 +35,7 @@ class ScanDialog : public KScanDialog TQ_OBJECT public: - ScanDialog( TQWidget *tqparent=0, const char *name=0, bool modal=false ); + ScanDialog( TQWidget *parent=0, const char *name=0, bool modal=false ); ~ScanDialog(); virtual bool setup(); @@ -72,10 +72,10 @@ private: class ScanDialogFactory : public KScanDialogFactory { public: - ScanDialogFactory( TQObject *tqparent=0, const char *name=0 ); + ScanDialogFactory( TQObject *parent=0, const char *name=0 ); protected: - virtual KScanDialog * createDialog( TQWidget *tqparent=0, const char *name=0, + virtual KScanDialog * createDialog( TQWidget *parent=0, const char *name=0, bool modal=false ); diff --git a/libkscan/scanparams.cpp b/libkscan/scanparams.cpp index 9cd0f3ab..ec9e77fe 100644 --- a/libkscan/scanparams.cpp +++ b/libkscan/scanparams.cpp @@ -53,8 +53,8 @@ -ScanParams::ScanParams( TQWidget *tqparent, const char *name ) - : TQVBox( tqparent, name ), +ScanParams::ScanParams( TQWidget *parent, const char *name ) + : TQVBox( parent, name ), m_firstGTEdit( true ) { /* first some initialisation and debug messages */ diff --git a/libkscan/scanparams.h b/libkscan/scanparams.h index d3536e42..a9f29d0e 100644 --- a/libkscan/scanparams.h +++ b/libkscan/scanparams.h @@ -49,7 +49,7 @@ class ScanParams : public TQVBox Q_OBJECT TQ_OBJECT public: - ScanParams( TQWidget *tqparent, const char *name = 0); + ScanParams( TQWidget *parent, const char *name = 0); ~ScanParams(); #if 0 TQSize tqsizeHint( ); diff --git a/libkscan/scansourcedialog.cpp b/libkscan/scansourcedialog.cpp index 2edac6f8..fcb3fc25 100644 --- a/libkscan/scansourcedialog.cpp +++ b/libkscan/scansourcedialog.cpp @@ -45,8 +45,8 @@ extern "C"{ #endif -ScanSourceDialog::ScanSourceDialog( TQWidget *tqparent, const TQStrList list, ADF_BEHAVE adfBehave ) - : KDialogBase( tqparent, "SOURCE_DIALOG", true, i18n("Scan Source Selection"), +ScanSourceDialog::ScanSourceDialog( TQWidget *parent, const TQStrList list, ADF_BEHAVE adfBehave ) + : KDialogBase( parent, "SOURCE_DIALOG", true, i18n("Scan Source Selection"), Ok|Cancel,Ok, true) { TQVBox *vbox = makeVBoxMainWidget(); diff --git a/libkscan/scansourcedialog.h b/libkscan/scansourcedialog.h index 3b0662d8..dbf2cc74 100644 --- a/libkscan/scansourcedialog.h +++ b/libkscan/scansourcedialog.h @@ -39,7 +39,7 @@ class ScanSourceDialog : public KDialogBase Q_OBJECT TQ_OBJECT public: - ScanSourceDialog( TQWidget *tqparent, const TQStrList, ADF_BEHAVE ); + ScanSourceDialog( TQWidget *parent, const TQStrList, ADF_BEHAVE ); ~ScanSourceDialog(); // void fillWithSources( TQStrList *list ); diff --git a/libkscan/sizeindicator.cpp b/libkscan/sizeindicator.cpp index 3b0a2a18..582f2330 100644 --- a/libkscan/sizeindicator.cpp +++ b/libkscan/sizeindicator.cpp @@ -29,8 +29,8 @@ -SizeIndicator::SizeIndicator( TQWidget *tqparent, long thres, long crit ) - :TQLabel( tqparent ) +SizeIndicator::SizeIndicator( TQWidget *parent, long thres, long crit ) + :TQLabel( parent ) { sizeInByte = -1; setFrameStyle( TQFrame::Box | TQFrame::Sunken ); diff --git a/libkscan/sizeindicator.h b/libkscan/sizeindicator.h index 0d248fec..52f2e8b1 100644 --- a/libkscan/sizeindicator.h +++ b/libkscan/sizeindicator.h @@ -50,7 +50,7 @@ public: * @param crit: Critical value, not yet used. */ - SizeIndicator( TQWidget *tqparent, long thres = DEFAULT_THRESHOLD, + SizeIndicator( TQWidget *parent, long thres = DEFAULT_THRESHOLD, long crit = DEFAULT_CRITICAL ); /** * destructor does not really do much yet. |