Browse Source

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
tags/v3.5.13
tpearson 8 years ago
parent
commit
e7366c97c9
100 changed files with 214 additions and 214 deletions
  1. 2
    2
      kamera/kcontrol/kamera.cpp
  2. 1
    1
      kamera/kcontrol/kamera.h
  3. 14
    14
      kamera/kcontrol/kameraconfigdialog.cpp
  4. 2
    2
      kamera/kcontrol/kameraconfigdialog.h
  5. 2
    2
      kamera/kcontrol/kameradevice.cpp
  6. 1
    1
      kamera/kcontrol/kameradevice.h
  7. 1
    1
      kamera/kioslave/kamera.cpp
  8. 1
    1
      kcoloredit/colorselector.cpp
  9. 1
    1
      kcoloredit/colorselector.h
  10. 1
    1
      kcoloredit/gradientselection.cpp
  11. 1
    1
      kcoloredit/gradientselection.h
  12. 1
    1
      kcoloredit/imageselection.cpp
  13. 1
    1
      kcoloredit/imageselection.h
  14. 3
    3
      kcoloredit/kcoloreditdoc.cpp
  15. 1
    1
      kcoloredit/kcoloreditdoc.h
  16. 1
    1
      kcoloredit/kcoloreditview.cpp
  17. 2
    2
      kcoloredit/kcoloreditview.h
  18. 1
    1
      kcoloredit/kxycolorselector.cpp
  19. 1
    1
      kcoloredit/kxycolorselector.h
  20. 2
    2
      kcoloredit/kzcolorselector.cpp
  21. 1
    1
      kcoloredit/kzcolorselector.h
  22. 2
    2
      kcoloredit/loadpalettedlg.cpp
  23. 1
    1
      kcoloredit/loadpalettedlg.h
  24. 2
    2
      kcoloredit/paletteview.cpp
  25. 2
    2
      kcoloredit/paletteview.h
  26. 2
    2
      kcoloredit/paletteviewscrolledarea.cpp
  27. 1
    1
      kcoloredit/paletteviewscrolledarea.h
  28. 1
    1
      kcoloredit/texteditselection.cpp
  29. 1
    1
      kcoloredit/texteditselection.h
  30. 1
    1
      kcoloredit/textselection.cpp
  31. 2
    2
      kdvi/TeXFont.h
  32. 20
    20
      kdvi/TeXFont_PFB.cpp
  33. 1
    1
      kdvi/TeXFont_PFB.h
  34. 15
    15
      kdvi/TeXFont_PK.cpp
  35. 1
    1
      kdvi/TeXFont_PK.h
  36. 9
    9
      kdvi/TeXFont_TFM.cpp
  37. 1
    1
      kdvi/TeXFont_TFM.h
  38. 1
    1
      kdvi/dviRenderer.cpp
  39. 1
    1
      kdvi/dviRenderer.h
  40. 3
    3
      kdvi/dviWidget.cpp
  41. 1
    1
      kdvi/dviWidget.h
  42. 3
    3
      kdvi/fontprogress.cpp
  43. 1
    1
      kdvi/fontprogress.h
  44. 2
    2
      kdvi/infodialog.cpp
  45. 1
    1
      kdvi/infodialog.h
  46. 3
    3
      kdvi/kdvi_multipage.cpp
  47. 1
    1
      kdvi/kdvi_multipage.h
  48. 3
    3
      kdvi/optionDialogFontsWidget.cpp
  49. 1
    1
      kdvi/optionDialogFontsWidget.h
  50. 3
    3
      kdvi/optionDialogSpecialWidget.cpp
  51. 1
    1
      kdvi/optionDialogSpecialWidget.h
  52. 3
    3
      kdvi/psheader.txt
  53. 1
    1
      kfax/kfax.h
  54. 2
    2
      kfax/kfax_printsettings.cpp
  55. 1
    1
      kfax/kfax_printsettings.h
  56. 2
    2
      kfax/options.cpp
  57. 1
    1
      kfax/options.h
  58. 2
    2
      kfaxview/faxmultipage.cpp
  59. 1
    1
      kfaxview/faxmultipage.h
  60. 1
    1
      kfaxview/faxrenderer.cpp
  61. 1
    1
      kfaxview/faxrenderer.h
  62. 2
    2
      kfaxview/libkfaximage/kfaximage.cpp
  63. 1
    1
      kfaxview/libkfaximage/kfaximage.h
  64. 2
    2
      kfile-plugins/bmp/kfile_bmp.cpp
  65. 1
    1
      kfile-plugins/bmp/kfile_bmp.h
  66. 10
    10
      kfile-plugins/dds/kfile_dds.cpp
  67. 1
    1
      kfile-plugins/dds/kfile_dds.h
  68. 2
    2
      kfile-plugins/dependencies/poppler-tqt/poppler-private.cc
  69. 1
    1
      kfile-plugins/dependencies/poppler-tqt/poppler-private.h
  70. 2
    2
      kfile-plugins/dvi/kfile_dvi.cpp
  71. 1
    1
      kfile-plugins/dvi/kfile_dvi.h
  72. 2
    2
      kfile-plugins/exr/kfile_exr.cpp
  73. 1
    1
      kfile-plugins/exr/kfile_exr.h
  74. 2
    2
      kfile-plugins/gif/kfile_gif.cpp
  75. 1
    1
      kfile-plugins/gif/kfile_gif.h
  76. 2
    2
      kfile-plugins/ico/kfile_ico.cpp
  77. 1
    1
      kfile-plugins/ico/kfile_ico.h
  78. 4
    4
      kfile-plugins/jpeg/kfile_jpeg.cpp
  79. 2
    2
      kfile-plugins/jpeg/kfile_jpeg.h
  80. 2
    2
      kfile-plugins/pcx/kfile_pcx.cpp
  81. 1
    1
      kfile-plugins/pcx/kfile_pcx.h
  82. 2
    2
      kfile-plugins/pdf/kfile_pdf.cpp
  83. 1
    1
      kfile-plugins/pdf/kfile_pdf.h
  84. 2
    2
      kfile-plugins/png/kfile_png.cpp
  85. 1
    1
      kfile-plugins/png/kfile_png.h
  86. 1
    1
      kfile-plugins/pnm/kfile_pnm.cpp
  87. 1
    1
      kfile-plugins/pnm/kfile_pnm.h
  88. 2
    2
      kfile-plugins/ps/kfile_ps.cpp
  89. 1
    1
      kfile-plugins/ps/kfile_ps.h
  90. 2
    2
      kfile-plugins/raw/kcamerarawplugin.cpp
  91. 1
    1
      kfile-plugins/raw/kcamerarawplugin.h
  92. 4
    4
      kfile-plugins/rgb/kfile_rgb.cpp
  93. 2
    2
      kfile-plugins/rgb/kfile_rgb.h
  94. 2
    2
      kfile-plugins/tga/kfile_tga.cpp
  95. 1
    1
      kfile-plugins/tga/kfile_tga.h
  96. 3
    3
      kfile-plugins/tiff/kfile_tiff.cpp
  97. 1
    1
      kfile-plugins/tiff/kfile_tiff.h
  98. 2
    2
      kfile-plugins/xbm/kfile_xbm.cpp
  99. 1
    1
      kfile-plugins/xbm/kfile_xbm.h
  100. 0
    0
      kfile-plugins/xpm/kfile_xpm.cpp

+ 2
- 2
kamera/kcontrol/kamera.cpp View File

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

+ 1
- 1
kamera/kcontrol/kamera.h View File

@@ -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

+ 14
- 14
kamera/kcontrol/kameraconfigdialog.cpp View File

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

+ 2
- 2
kamera/kcontrol/kameraconfigdialog.h View File

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

+ 2
- 2
kamera/kcontrol/kameradevice.cpp View File

@@ -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 &)),

+ 1
- 1
kamera/kcontrol/kameradevice.h View File

@@ -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:

+ 1
- 1
kamera/kioslave/kamera.cpp View File

@@ -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

+ 1
- 1
kcoloredit/colorselector.cpp View File

@@ -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);
/*

+ 1
- 1
kcoloredit/colorselector.h View File

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

+ 1
- 1
kcoloredit/gradientselection.cpp View File

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

+ 1
- 1
kcoloredit/gradientselection.h View File

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

+ 1
- 1
kcoloredit/imageselection.cpp View File

@@ -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(){
}

+ 1
- 1
kcoloredit/imageselection.h View File

@@ -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:

+ 3
- 3
kcoloredit/kcoloreditdoc.cpp View File

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

+ 1
- 1
kcoloredit/kcoloreditdoc.h View File

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


+ 1
- 1
kcoloredit/kcoloreditview.cpp View File

@@ -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, "" ));

+ 2
- 2
kcoloredit/kcoloreditview.h View File

@@ -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

+ 1
- 1
kcoloredit/kxycolorselector.cpp View File

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

+ 1
- 1
kcoloredit/kxycolorselector.h View File

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

+ 2
- 2
kcoloredit/kzcolorselector.cpp View File

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

+ 1
- 1
kcoloredit/kzcolorselector.h View File

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

+ 2
- 2
kcoloredit/loadpalettedlg.cpp View File

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

+ 1
- 1
kcoloredit/loadpalettedlg.h View File

@@ -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
*/

+ 2
- 2
kcoloredit/paletteview.cpp View File

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

+ 2
- 2
kcoloredit/paletteview.h View File

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

+ 2
- 2
kcoloredit/paletteviewscrolledarea.cpp View File

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

+ 1
- 1
kcoloredit/paletteviewscrolledarea.h View File

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

+ 1
- 1
kcoloredit/texteditselection.cpp View File

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

+ 1
- 1
kcoloredit/texteditselection.h View File

@@ -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:

+ 1
- 1
kcoloredit/textselection.cpp View File

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

+ 2
- 2
kdvi/TeXFont.h View File

@@ -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

+ 20
- 20
kdvi/TeXFont_PFB.cpp View File

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

+ 1
- 1
kdvi/TeXFont_PFB.h View File

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

+ 15
- 15
kdvi/TeXFont_PK.cpp View File

@@ -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?
}

+ 1
- 1
kdvi/TeXFont_PK.h View File

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

+ 9
- 9
kdvi/TeXFont_TFM.cpp View File

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

+ 1
- 1
kdvi/TeXFont_TFM.h View File

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

+ 1
- 1
kdvi/dviRenderer.cpp View File

@@ -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

+ 1
- 1
kdvi/dviRenderer.h View File

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

+ 3
- 3
kdvi/dviWidget.cpp View File

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


+ 1
- 1
kdvi/dviWidget.h View File

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

+ 3
- 3
kdvi/fontprogress.cpp View File

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


+ 1
- 1
kdvi/fontprogress.h View File

@@ -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

+ 2
- 2
kdvi/infodialog.cpp View File

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

+ 1
- 1
kdvi/infodialog.h View File

@@ -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:

+ 3
- 3
kdvi/kdvi_multipage.cpp View File

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

+ 1
- 1
kdvi/kdvi_multipage.h View File

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


+ 3
- 3
kdvi/optionDialogFontsWidget.cpp View File

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

+ 1
- 1
kdvi/optionDialogFontsWidget.h View File

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


+ 3
- 3
kdvi/optionDialogSpecialWidget.cpp View File

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

+ 1
- 1
kdvi/optionDialogSpecialWidget.h View File

@@ -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:

+ 3
- 3
kdvi/psheader.txt View File

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

+ 1
- 1
kfax/kfax.h View File

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

+ 2
- 2
kfax/kfax_printsettings.cpp View File

@@ -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>"

+ 1
- 1
kfax/kfax_printsettings.h View File

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

+ 2
- 2
kfax/options.cpp View File

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

+ 1
- 1
kfax/options.h View File

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

+ 2
- 2
kfaxview/faxmultipage.cpp View File

@@ -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. */

+ 1
- 1
kfaxview/faxmultipage.h View File

@@ -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

+ 1
- 1
kfaxview/faxrenderer.cpp View File

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


+ 1
- 1
kfaxview/faxrenderer.h View File

@@ -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


+ 2
- 2
kfaxview/libkfaximage/kfaximage.cpp View File

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

+ 1
- 1
kfaxview/libkfaximage/kfaximage.h View File

@@ -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

+ 2
- 2
kfile-plugins/bmp/kfile_bmp.cpp View File

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


+ 1
- 1
kfile-plugins/bmp/kfile_bmp.h View File

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

+ 10
- 10
kfile-plugins/dds/kfile_dds.cpp View File

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


+ 1
- 1
kfile-plugins/dds/kfile_dds.h View File

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

+ 2
- 2
kfile-plugins/dependencies/poppler-tqt/poppler-private.cc View File

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

+ 1
- 1
kfile-plugins/dependencies/poppler-tqt/poppler-private.h View File

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

+ 2
- 2
kfile-plugins/dvi/kfile_dvi.cpp View File

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

+ 1
- 1
kfile-plugins/dvi/kfile_dvi.h View File

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

+ 2
- 2
kfile-plugins/exr/kfile_exr.cpp View File

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

+ 1
- 1
kfile-plugins/exr/kfile_exr.h View File

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

+ 2
- 2
kfile-plugins/gif/kfile_gif.cpp View File

@@ -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";


+ 1
- 1
kfile-plugins/gif/kfile_gif.h View File

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

+ 2
- 2
kfile-plugins/ico/kfile_ico.cpp View File

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


+ 1
- 1
kfile-plugins/ico/kfile_ico.h View File

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

+ 4
- 4
kfile-plugins/jpeg/kfile_jpeg.cpp View File

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

+ 2
- 2
kfile-plugins/jpeg/kfile_jpeg.h View File

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

+ 2
- 2
kfile-plugins/pcx/kfile_pcx.cpp View File

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

+ 1
- 1
kfile-plugins/pcx/kfile_pcx.h View File

@@ -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:

+ 2
- 2
kfile-plugins/pdf/kfile_pdf.cpp View File

@@ -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";


+ 1
- 1
kfile-plugins/pdf/kfile_pdf.h View File

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

+ 2
- 2
kfile-plugins/png/kfile_png.cpp View File

@@ -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";


+ 1
- 1
kfile-plugins/png/kfile_png.h View File

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

+ 1
- 1
kfile-plugins/pnm/kfile_pnm.cpp View File

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

+ 1
- 1
kfile-plugins/pnm/kfile_pnm.h View File

@@ -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:

+ 2
- 2
kfile-plugins/ps/kfile_ps.cpp View File

@@ -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";

+ 1
- 1
kfile-plugins/ps/kfile_ps.h View File

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

+ 2
- 2
kfile-plugins/raw/kcamerarawplugin.cpp View File

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


+ 1
- 1
kfile-plugins/raw/kcamerarawplugin.h View File

@@ -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:

+ 4
- 4
kfile-plugins/rgb/kfile_rgb.cpp View File

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



+ 2
- 2
kfile-plugins/rgb/kfile_rgb.h View File

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

};


+ 2
- 2
kfile-plugins/tga/kfile_tga.cpp View File

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


+ 1
- 1
kfile-plugins/tga/kfile_tga.h View File

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

+ 3
- 3
kfile-plugins/tiff/kfile_tiff.cpp View File

@@ -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,

+ 1
- 1
kfile-plugins/tiff/kfile_tiff.h View File

@@ -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:

+ 2
- 2
kfile-plugins/xbm/kfile_xbm.cpp View File

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


+ 1
- 1
kfile-plugins/xbm/kfile_xbm.h View File

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

+ 0
- 0
kfile-plugins/xpm/kfile_xpm.cpp View File


Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save