diff options
131 files changed, 235 insertions, 235 deletions
diff --git a/ksquirrel/imageedit/sq_bcglabel.cpp b/ksquirrel/imageedit/sq_bcglabel.cpp index 968dbd9..39c5f62 100644 --- a/ksquirrel/imageedit/sq_bcglabel.cpp +++ b/ksquirrel/imageedit/sq_bcglabel.cpp @@ -17,7 +17,7 @@ #include "sq_bcglabel.h" -SQ_BCGLabel::SQ_BCGLabel(TQWidget *tqparent, const char *name, WFlags f) : TQLabel(tqparent, name, f | TQt::WNoAutoErase) +SQ_BCGLabel::SQ_BCGLabel(TQWidget *parent, const char *name, WFlags f) : TQLabel(parent, name, f | TQt::WNoAutoErase) { setScaledContents(false); diff --git a/ksquirrel/imageedit/sq_bcglabel.h b/ksquirrel/imageedit/sq_bcglabel.h index 7c9bc86..d8546a9 100644 --- a/ksquirrel/imageedit/sq_bcglabel.h +++ b/ksquirrel/imageedit/sq_bcglabel.h @@ -27,7 +27,7 @@ class SQ_BCGLabel : public TQLabel { public: - SQ_BCGLabel(TQWidget *tqparent, const char *name = 0, WFlags f = 0); + SQ_BCGLabel(TQWidget *parent, const char *name = 0, WFlags f = 0); ~SQ_BCGLabel(); }; diff --git a/ksquirrel/imageedit/sq_converter.cpp b/ksquirrel/imageedit/sq_converter.cpp index bcd7b70..0f5cd5f 100644 --- a/ksquirrel/imageedit/sq_converter.cpp +++ b/ksquirrel/imageedit/sq_converter.cpp @@ -44,7 +44,7 @@ SQ_Converter * SQ_Converter::m_sing = 0; -SQ_Converter::SQ_Converter(TQObject *tqparent) : TQObject(tqparent) +SQ_Converter::SQ_Converter(TQObject *parent) : TQObject(parent) { m_sing = this; diff --git a/ksquirrel/imageedit/sq_converter.h b/ksquirrel/imageedit/sq_converter.h index 8a7d1ec..b785593 100644 --- a/ksquirrel/imageedit/sq_converter.h +++ b/ksquirrel/imageedit/sq_converter.h @@ -50,7 +50,7 @@ class SQ_Converter : public TQObject TQ_OBJECT public: - SQ_Converter(TQObject *tqparent); + SQ_Converter(TQObject *parent); ~SQ_Converter(); public: diff --git a/ksquirrel/imageedit/sq_label.cpp b/ksquirrel/imageedit/sq_label.cpp index 70ecff8..a55a6eb 100644 --- a/ksquirrel/imageedit/sq_label.cpp +++ b/ksquirrel/imageedit/sq_label.cpp @@ -21,7 +21,7 @@ #define MARGIN 15 -SQ_Label::SQ_Label(TQWidget *tqparent, const char *name) : TQWidget(tqparent, name), single(false) +SQ_Label::SQ_Label(TQWidget *parent, const char *name) : TQWidget(parent, name), single(false) {} SQ_Label::~SQ_Label() diff --git a/ksquirrel/imageedit/sq_label.h b/ksquirrel/imageedit/sq_label.h index a1fed65..6d0edd5 100644 --- a/ksquirrel/imageedit/sq_label.h +++ b/ksquirrel/imageedit/sq_label.h @@ -23,7 +23,7 @@ class SQ_Label : public TQWidget { public: - SQ_Label(TQWidget *tqparent = 0, const char *name = 0); + SQ_Label(TQWidget *parent = 0, const char *name = 0); ~SQ_Label(); void setText(const TQString <, const TQString &rt); diff --git a/ksquirrel/ksquirrel-libs-configurator/klc.cpp b/ksquirrel/ksquirrel-libs-configurator/klc.cpp index f510128..4a90161 100644 --- a/ksquirrel/ksquirrel-libs-configurator/klc.cpp +++ b/ksquirrel/ksquirrel-libs-configurator/klc.cpp @@ -28,11 +28,11 @@ #include "./klc.ui.h" /* - * Constructs a KLC as a child of 'tqparent', with the + * Constructs a KLC as a child of 'parent', with the * name 'name' and widget flags set to 'f'. */ -KLC::KLC( TQWidget* tqparent, const char* name, WFlags fl ) - : TQWidget( tqparent, name, fl ) +KLC::KLC( TQWidget* parent, const char* name, WFlags fl ) + : TQWidget( parent, name, fl ) { if ( !name ) setName( "KLC" ); diff --git a/ksquirrel/ksquirrel.cpp b/ksquirrel/ksquirrel.cpp index 968aa90..57a46ec 100644 --- a/ksquirrel/ksquirrel.cpp +++ b/ksquirrel/ksquirrel.cpp @@ -124,8 +124,8 @@ static const int menuParam = 100000; KSquirrel * KSquirrel::m_instance = 0; -KSquirrel::KSquirrel(TQWidget *tqparent, const char *name) - : KMainWindow (tqparent, name), DCOPObject(name) +KSquirrel::KSquirrel(TQWidget *parent, const char *name) + : KMainWindow (parent, name), DCOPObject(name) { // singleton setup m_instance = this; diff --git a/ksquirrel/ksquirrel.h b/ksquirrel/ksquirrel.h index 9300946..33af511 100644 --- a/ksquirrel/ksquirrel.h +++ b/ksquirrel/ksquirrel.h @@ -84,7 +84,7 @@ class KSquirrel : public KMainWindow, public DCOPObject /* * Constructor & destructor */ - KSquirrel(TQWidget *tqparent, const char *name); + KSquirrel(TQWidget *parent, const char *name); ~KSquirrel(); SQ_Progress* diskProgress(); diff --git a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp index 160f6fd..f22b923 100644 --- a/ksquirrel/ksquirrelpart/ksquirrelpart.cpp +++ b/ksquirrel/ksquirrelpart/ksquirrelpart.cpp @@ -39,8 +39,8 @@ typedef KParts::GenericFactory<KSquirrelPart> KSquirrelFactory; K_EXPORT_COMPONENT_FACTORY(libksquirrelpart, KSquirrelFactory) KSquirrelPart::KSquirrelPart(TQWidget *parentWidget, const char *, - TQObject* tqparent, const char *name, - const TQStringList &) : KParts::ReadOnlyPart(tqparent, name) + TQObject* parent, const char *name, + const TQStringList &) : KParts::ReadOnlyPart(parent, name) { kdDebug() << "+KSquirrelPart" << endl; diff --git a/ksquirrel/ksquirrelpart/sq_bcglabel.cpp b/ksquirrel/ksquirrelpart/sq_bcglabel.cpp index 968dbd9..39c5f62 100644 --- a/ksquirrel/ksquirrelpart/sq_bcglabel.cpp +++ b/ksquirrel/ksquirrelpart/sq_bcglabel.cpp @@ -17,7 +17,7 @@ #include "sq_bcglabel.h" -SQ_BCGLabel::SQ_BCGLabel(TQWidget *tqparent, const char *name, WFlags f) : TQLabel(tqparent, name, f | TQt::WNoAutoErase) +SQ_BCGLabel::SQ_BCGLabel(TQWidget *parent, const char *name, WFlags f) : TQLabel(parent, name, f | TQt::WNoAutoErase) { setScaledContents(false); diff --git a/ksquirrel/ksquirrelpart/sq_bcglabel.h b/ksquirrel/ksquirrelpart/sq_bcglabel.h index 7c9bc86..d8546a9 100644 --- a/ksquirrel/ksquirrelpart/sq_bcglabel.h +++ b/ksquirrel/ksquirrelpart/sq_bcglabel.h @@ -27,7 +27,7 @@ class SQ_BCGLabel : public TQLabel { public: - SQ_BCGLabel(TQWidget *tqparent, const char *name = 0, WFlags f = 0); + SQ_BCGLabel(TQWidget *parent, const char *name = 0, WFlags f = 0); ~SQ_BCGLabel(); }; diff --git a/ksquirrel/ksquirrelpart/sq_config.cpp b/ksquirrel/ksquirrelpart/sq_config.cpp index 9cc2b82..8e6e0fa 100644 --- a/ksquirrel/ksquirrelpart/sq_config.cpp +++ b/ksquirrel/ksquirrelpart/sq_config.cpp @@ -23,7 +23,7 @@ SQ_Config * SQ_Config::m_instance = 0; -SQ_Config::SQ_Config(TQObject *tqparent) : TQObject(tqparent) +SQ_Config::SQ_Config(TQObject *parent) : TQObject(parent) { m_instance = this; diff --git a/ksquirrel/ksquirrelpart/sq_config.h b/ksquirrel/ksquirrelpart/sq_config.h index 4415d18..438a8e7 100644 --- a/ksquirrel/ksquirrelpart/sq_config.h +++ b/ksquirrel/ksquirrelpart/sq_config.h @@ -30,7 +30,7 @@ class KConfig; class SQ_Config : public TQObject { public: - SQ_Config(TQObject *tqparent = 0); + SQ_Config(TQObject *parent = 0); ~SQ_Config(); static SQ_Config* instance() { return m_instance; } diff --git a/ksquirrel/ksquirrelpart/sq_diroperator.cpp b/ksquirrel/ksquirrelpart/sq_diroperator.cpp index 129180f..00eabf6 100644 --- a/ksquirrel/ksquirrelpart/sq_diroperator.cpp +++ b/ksquirrel/ksquirrelpart/sq_diroperator.cpp @@ -25,7 +25,7 @@ SQ_DirOperator * SQ_DirOperator::m_inst = 0; -SQ_DirOperator::SQ_DirOperator(TQObject *tqparent) : TQObject(tqparent) +SQ_DirOperator::SQ_DirOperator(TQObject *parent) : TQObject(parent) { m_inst = this; @@ -75,12 +75,12 @@ void SQ_DirOperator::slotDownloadPercents(int p) SQ_GLWidget::window()->setDownloadPercents(p); } -void SQ_DirOperator::del(const KURL &u, TQWidget *tqparent) +void SQ_DirOperator::del(const KURL &u, TQWidget *parent) { KURL::List list; list.append(u); - KonqOperations::del(tqparent, KonqOperations::DEL, list); + KonqOperations::del(parent, KonqOperations::DEL, list); } #include "sq_diroperator.moc" diff --git a/ksquirrel/ksquirrelpart/sq_diroperator.h b/ksquirrel/ksquirrelpart/sq_diroperator.h index 2c2106c..a54d745 100644 --- a/ksquirrel/ksquirrelpart/sq_diroperator.h +++ b/ksquirrel/ksquirrelpart/sq_diroperator.h @@ -32,14 +32,14 @@ class SQ_DirOperator : public TQObject TQ_OBJECT public: - SQ_DirOperator(TQObject *tqparent = 0); + SQ_DirOperator(TQObject *parent = 0); ~SQ_DirOperator(); static SQ_DirOperator* instance() { return m_inst; } void execute(KFileItem *item); - void del(const KURL &u, TQWidget *tqparent = 0); + void del(const KURL &u, TQWidget *parent = 0); private: void executePrivate(KFileItem *); diff --git a/ksquirrel/ksquirrelpart/sq_downloader.cpp b/ksquirrel/ksquirrelpart/sq_downloader.cpp index 07759dc..31fecc5 100644 --- a/ksquirrel/ksquirrelpart/sq_downloader.cpp +++ b/ksquirrel/ksquirrelpart/sq_downloader.cpp @@ -30,7 +30,7 @@ #define SQ_PREDOWNLOAD_SIZE 50 -SQ_Downloader::SQ_Downloader(TQObject *tqparent, const char *name) : TQObject(tqparent, name), job(0), m_error(false) +SQ_Downloader::SQ_Downloader(TQObject *parent, const char *name) : TQObject(parent, name), job(0), m_error(false) { tmp = new KTempFile; tmp->setAutoDelete(true); diff --git a/ksquirrel/ksquirrelpart/sq_downloader.h b/ksquirrel/ksquirrelpart/sq_downloader.h index 949af80..dbb03f3 100644 --- a/ksquirrel/ksquirrelpart/sq_downloader.h +++ b/ksquirrel/ksquirrelpart/sq_downloader.h @@ -34,7 +34,7 @@ class SQ_Downloader : public TQObject TQ_OBJECT public: - SQ_Downloader(TQObject *tqparent = 0, const char *name = 0); + SQ_Downloader(TQObject *parent = 0, const char *name = 0); ~SQ_Downloader(); void start(KFileItem *fi); diff --git a/ksquirrel/ksquirrelpart/sq_errorstring.cpp b/ksquirrel/ksquirrelpart/sq_errorstring.cpp index dcbdb90..cd5a047 100644 --- a/ksquirrel/ksquirrelpart/sq_errorstring.cpp +++ b/ksquirrel/ksquirrelpart/sq_errorstring.cpp @@ -25,7 +25,7 @@ SQ_ErrorString * SQ_ErrorString::m_instance = 0; -SQ_ErrorString::SQ_ErrorString(TQObject *tqparent) : TQObject(tqparent) +SQ_ErrorString::SQ_ErrorString(TQObject *parent) : TQObject(parent) { m_instance = this; diff --git a/ksquirrel/ksquirrelpart/sq_errorstring.h b/ksquirrel/ksquirrelpart/sq_errorstring.h index 469fe47..b0df250 100644 --- a/ksquirrel/ksquirrelpart/sq_errorstring.h +++ b/ksquirrel/ksquirrelpart/sq_errorstring.h @@ -33,7 +33,7 @@ class SQ_ErrorString : public TQObject { public: - SQ_ErrorString(TQObject *tqparent = 0); + SQ_ErrorString(TQObject *parent = 0); ~SQ_ErrorString(); /* diff --git a/ksquirrel/ksquirrelpart/sq_externaltool.cpp b/ksquirrel/ksquirrelpart/sq_externaltool.cpp index adc0fda..cd5a5f7 100644 --- a/ksquirrel/ksquirrelpart/sq_externaltool.cpp +++ b/ksquirrel/ksquirrelpart/sq_externaltool.cpp @@ -45,7 +45,7 @@ Tool::Tool(const TQString &pix, const TQString &nam, const TQString &com) command = com; } -SQ_ExternalTool::SQ_ExternalTool(TQObject *tqparent) : TQObject(tqparent), TQValueVector<Tool>() +SQ_ExternalTool::SQ_ExternalTool(TQObject *parent) : TQObject(parent), TQValueVector<Tool>() { m_instance = this; menu = new SQ_PopupMenu(0, "External tools"); diff --git a/ksquirrel/ksquirrelpart/sq_externaltool.h b/ksquirrel/ksquirrelpart/sq_externaltool.h index a2c0e8a..1def26b 100644 --- a/ksquirrel/ksquirrelpart/sq_externaltool.h +++ b/ksquirrel/ksquirrelpart/sq_externaltool.h @@ -46,7 +46,7 @@ class SQ_ExternalTool : public TQObject, public TQValueVector<Tool> TQ_OBJECT public: - SQ_ExternalTool(TQObject *tqparent = 0); + SQ_ExternalTool(TQObject *parent = 0); ~SQ_ExternalTool(); /* diff --git a/ksquirrel/ksquirrelpart/sq_filedialog.cpp b/ksquirrel/ksquirrelpart/sq_filedialog.cpp index 6e8fb82..3b883b5 100644 --- a/ksquirrel/ksquirrelpart/sq_filedialog.cpp +++ b/ksquirrel/ksquirrelpart/sq_filedialog.cpp @@ -19,8 +19,8 @@ #include "sq_filedialog.h" -SQ_FileDialog::SQ_FileDialog(const TQString &path, TQWidget *tqparent) - : KFileDialog(path, TQString(), tqparent, "select_a_file", true) +SQ_FileDialog::SQ_FileDialog(const TQString &path, TQWidget *parent) + : KFileDialog(path, TQString(), parent, "select_a_file", true) {} SQ_FileDialog::~SQ_FileDialog() diff --git a/ksquirrel/ksquirrelpart/sq_filedialog.h b/ksquirrel/ksquirrelpart/sq_filedialog.h index 3c68956..6286c1b 100644 --- a/ksquirrel/ksquirrelpart/sq_filedialog.h +++ b/ksquirrel/ksquirrelpart/sq_filedialog.h @@ -27,7 +27,7 @@ class SQ_FileDialog : public KFileDialog { public: - SQ_FileDialog(const TQString &path, TQWidget *tqparent); + SQ_FileDialog(const TQString &path, TQWidget *parent); ~SQ_FileDialog(); TQString nameFilter() const; diff --git a/ksquirrel/ksquirrelpart/sq_glview.cpp b/ksquirrel/ksquirrelpart/sq_glview.cpp index 1624b7c..316a670 100644 --- a/ksquirrel/ksquirrelpart/sq_glview.cpp +++ b/ksquirrel/ksquirrelpart/sq_glview.cpp @@ -23,7 +23,7 @@ SQ_GLView * SQ_GLView::m_inst = 0; /***************************************/ -SQ_TextSetter::SQ_TextSetter(TQObject *tqparent) : TQObject(tqparent) +SQ_TextSetter::SQ_TextSetter(TQObject *parent) : TQObject(parent) { dest = "---"; } diff --git a/ksquirrel/ksquirrelpart/sq_glview.h b/ksquirrel/ksquirrelpart/sq_glview.h index 6f06a38..7fbe8b4 100644 --- a/ksquirrel/ksquirrelpart/sq_glview.h +++ b/ksquirrel/ksquirrelpart/sq_glview.h @@ -28,7 +28,7 @@ class SQ_TextSetter : public TQObject TQ_OBJECT public: - SQ_TextSetter(TQObject *tqparent = 0); + SQ_TextSetter(TQObject *parent = 0); ~SQ_TextSetter(); void setText(const TQString &); diff --git a/ksquirrel/ksquirrelpart/sq_glwidget.cpp b/ksquirrel/ksquirrelpart/sq_glwidget.cpp index 5c2fa4c..4891e6f 100644 --- a/ksquirrel/ksquirrelpart/sq_glwidget.cpp +++ b/ksquirrel/ksquirrelpart/sq_glwidget.cpp @@ -105,7 +105,7 @@ static const float SQ_ONSCREEN_LAYER = 10000.0; /* ***************************************************************************************** */ -SQ_GLWidget::SQ_GLWidget(TQWidget *tqparent, const char *name) : TQGLWidget(tqparent, name) +SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent, name) { kdDebug() << "+SQ_GLWidget" << endl; diff --git a/ksquirrel/ksquirrelpart/sq_glwidget.h b/ksquirrel/ksquirrelpart/sq_glwidget.h index 2c9ee58..bb092a9 100644 --- a/ksquirrel/ksquirrelpart/sq_glwidget.h +++ b/ksquirrel/ksquirrelpart/sq_glwidget.h @@ -127,7 +127,7 @@ class SQ_GLWidget : public TQGLWidget TQ_OBJECT public: - SQ_GLWidget(TQWidget *tqparent = 0, const char *name = 0); + SQ_GLWidget(TQWidget *parent = 0, const char *name = 0); ~SQ_GLWidget(); void setDownloadPercents(int); diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_helpers.cpp b/ksquirrel/ksquirrelpart/sq_glwidget_helpers.cpp index f501478..6b770f8 100644 --- a/ksquirrel/ksquirrelpart/sq_glwidget_helpers.cpp +++ b/ksquirrel/ksquirrelpart/sq_glwidget_helpers.cpp @@ -36,8 +36,8 @@ #include "sq_glwidget_helpers.h" -SQ_ToolButtonPopup::SQ_ToolButtonPopup(const TQPixmap &pix, const TQString &textLabel, KToolBar *tqparent) - : KToolBarButton(pix, -1, tqparent, 0, textLabel) +SQ_ToolButtonPopup::SQ_ToolButtonPopup(const TQPixmap &pix, const TQString &textLabel, KToolBar *parent) + : KToolBarButton(pix, -1, parent, 0, textLabel) { setFixedWidth(SQ_ToolButton::fixedWidth()); } @@ -46,8 +46,8 @@ SQ_ToolButtonPopup::~SQ_ToolButtonPopup() {} SQ_ToolButton::SQ_ToolButton(const TQIconSet &iconSet, const TQString &textLabel, - TQObject *receiver, const char *slot, KToolBar *tqparent, const char *name) - : TQToolButton(iconSet, textLabel, TQString(), receiver, slot, tqparent, name) + TQObject *receiver, const char *slot, KToolBar *parent, const char *name) + : TQToolButton(iconSet, textLabel, TQString(), receiver, slot, parent, name) { setFixedWidth(SQ_ToolButton::fixedWidth()); } diff --git a/ksquirrel/ksquirrelpart/sq_glwidget_helpers.h b/ksquirrel/ksquirrelpart/sq_glwidget_helpers.h index 12dacfa..18e1956 100644 --- a/ksquirrel/ksquirrelpart/sq_glwidget_helpers.h +++ b/ksquirrel/ksquirrelpart/sq_glwidget_helpers.h @@ -29,7 +29,7 @@ struct RGBA; class SQ_ToolButtonPopup : public KToolBarButton { public: - SQ_ToolButtonPopup(const TQPixmap &pix, const TQString &textLabel, KToolBar *tqparent); + SQ_ToolButtonPopup(const TQPixmap &pix, const TQString &textLabel, KToolBar *parent); ~SQ_ToolButtonPopup(); }; @@ -37,7 +37,7 @@ class SQ_ToolButton : public TQToolButton { public: SQ_ToolButton(const TQIconSet &iconSet, const TQString &textLabel, TQObject *receiver, - const char *slot, KToolBar *tqparent, const char *name = 0); + const char *slot, KToolBar *parent, const char *name = 0); ~SQ_ToolButton(); static int fixedWidth(); diff --git a/ksquirrel/ksquirrelpart/sq_iconloader.cpp b/ksquirrel/ksquirrelpart/sq_iconloader.cpp index 91feec2..05fbd12 100644 --- a/ksquirrel/ksquirrelpart/sq_iconloader.cpp +++ b/ksquirrel/ksquirrelpart/sq_iconloader.cpp @@ -27,7 +27,7 @@ SQ_IconLoader * SQ_IconLoader::m_instance = 0; -SQ_IconLoader::SQ_IconLoader(TQObject *tqparent) : TQObject(tqparent) +SQ_IconLoader::SQ_IconLoader(TQObject *parent) : TQObject(parent) { m_instance = this; diff --git a/ksquirrel/ksquirrelpart/sq_iconloader.h b/ksquirrel/ksquirrelpart/sq_iconloader.h index 2c40530..a49ee11 100644 --- a/ksquirrel/ksquirrelpart/sq_iconloader.h +++ b/ksquirrel/ksquirrelpart/sq_iconloader.h @@ -32,7 +32,7 @@ class SQ_IconLoader : public TQObject { public: - SQ_IconLoader(TQObject *tqparent = 0); + SQ_IconLoader(TQObject *parent = 0); ~SQ_IconLoader(); TQPixmap loadIcon(const TQString &name, KIcon::Group group = KIcon::Desktop, int size = 16) const; diff --git a/ksquirrel/ksquirrelpart/sq_label.cpp b/ksquirrel/ksquirrelpart/sq_label.cpp index 70ecff8..a55a6eb 100644 --- a/ksquirrel/ksquirrelpart/sq_label.cpp +++ b/ksquirrel/ksquirrelpart/sq_label.cpp @@ -21,7 +21,7 @@ #define MARGIN 15 -SQ_Label::SQ_Label(TQWidget *tqparent, const char *name) : TQWidget(tqparent, name), single(false) +SQ_Label::SQ_Label(TQWidget *parent, const char *name) : TQWidget(parent, name), single(false) {} SQ_Label::~SQ_Label() diff --git a/ksquirrel/ksquirrelpart/sq_label.h b/ksquirrel/ksquirrelpart/sq_label.h index a1fed65..6d0edd5 100644 --- a/ksquirrel/ksquirrelpart/sq_label.h +++ b/ksquirrel/ksquirrelpart/sq_label.h @@ -23,7 +23,7 @@ class SQ_Label : public TQWidget { public: - SQ_Label(TQWidget *tqparent = 0, const char *name = 0); + SQ_Label(TQWidget *parent = 0, const char *name = 0); ~SQ_Label(); void setText(const TQString <, const TQString &rt); diff --git a/ksquirrel/ksquirrelpart/sq_libraryhandler.cpp b/ksquirrel/ksquirrelpart/sq_libraryhandler.cpp index a264d33..23c84da 100644 --- a/ksquirrel/ksquirrelpart/sq_libraryhandler.cpp +++ b/ksquirrel/ksquirrelpart/sq_libraryhandler.cpp @@ -46,8 +46,8 @@ static const int buffer_size = 10; SQ_LibraryHandler * SQ_LibraryHandler::m_instance = 0; // SQ_LibraryHandler -SQ_LibraryHandler::SQ_LibraryHandler(TQObject *tqparent) - : TQObject(tqparent), TQValueVector<SQ_LIBRARY>() +SQ_LibraryHandler::SQ_LibraryHandler(TQObject *parent) + : TQObject(parent), TQValueVector<SQ_LIBRARY>() { m_instance = this; diff --git a/ksquirrel/ksquirrelpart/sq_libraryhandler.h b/ksquirrel/ksquirrelpart/sq_libraryhandler.h index 05bd4c9..de00e3d 100644 --- a/ksquirrel/ksquirrelpart/sq_libraryhandler.h +++ b/ksquirrel/ksquirrelpart/sq_libraryhandler.h @@ -37,7 +37,7 @@ class KURL; class SQ_LibraryHandler : public TQObject, public TQValueVector<SQ_LIBRARY> { public: - SQ_LibraryHandler(TQObject *tqparent = 0); + SQ_LibraryHandler(TQObject *parent = 0); ~SQ_LibraryHandler(); enum Support { Maybe = 0, Yes, No }; diff --git a/ksquirrel/ksquirrelpart/sq_popupmenu.cpp b/ksquirrel/ksquirrelpart/sq_popupmenu.cpp index 0dafd91..8bafe01 100644 --- a/ksquirrel/ksquirrelpart/sq_popupmenu.cpp +++ b/ksquirrel/ksquirrelpart/sq_popupmenu.cpp @@ -21,8 +21,8 @@ #include "sq_popupmenu.h" -SQ_PopupMenu::SQ_PopupMenu(TQWidget *tqparent, const char *name) - : KPopupMenu(tqparent, name), title(0) +SQ_PopupMenu::SQ_PopupMenu(TQWidget *parent, const char *name) + : KPopupMenu(parent, name), title(0) {} SQ_PopupMenu::~SQ_PopupMenu() diff --git a/ksquirrel/ksquirrelpart/sq_popupmenu.h b/ksquirrel/ksquirrelpart/sq_popupmenu.h index 0714d64..5df3d88 100644 --- a/ksquirrel/ksquirrelpart/sq_popupmenu.h +++ b/ksquirrel/ksquirrelpart/sq_popupmenu.h @@ -27,7 +27,7 @@ class SQ_PopupMenu : public KPopupMenu { public: - SQ_PopupMenu(TQWidget *tqparent = 0, const char *name = 0); + SQ_PopupMenu(TQWidget *parent = 0, const char *name = 0); ~SQ_PopupMenu(); void insertTitle(const TQString &t); diff --git a/ksquirrel/sidebar/sq_categoriesview.cpp b/ksquirrel/sidebar/sq_categoriesview.cpp index 6813f6b..2953156 100644 --- a/ksquirrel/sidebar/sq_categoriesview.cpp +++ b/ksquirrel/sidebar/sq_categoriesview.cpp @@ -51,16 +51,16 @@ SQ_CategoriesBox * SQ_CategoriesBox::sing = 0; /* *************************************************************************************** */ -SQ_CategoriesViewBranch::SQ_CategoriesViewBranch(KFileTreeView *tqparent, const KURL &url, const TQString &name, const TQPixmap &pix) - : KFileTreeBranch(tqparent, url, name, pix) +SQ_CategoriesViewBranch::SQ_CategoriesViewBranch(KFileTreeView *parent, const KURL &url, const TQString &name, const TQPixmap &pix) + : KFileTreeBranch(parent, url, name, pix) {} SQ_CategoriesViewBranch::~SQ_CategoriesViewBranch() {} -KFileTreeViewItem* SQ_CategoriesViewBranch::createTreeViewItem(KFileTreeViewItem *tqparent, KFileItem *fileItem) +KFileTreeViewItem* SQ_CategoriesViewBranch::createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem) { - KFileTreeViewItem *i = KFileTreeBranch::createTreeViewItem(tqparent, fileItem); + KFileTreeViewItem *i = KFileTreeBranch::createTreeViewItem(parent, fileItem); /* * In storage there are files with MD5 sum appended to their names. @@ -83,7 +83,7 @@ KFileTreeViewItem* SQ_CategoriesViewBranch::createTreeViewItem(KFileTreeViewItem /* *************************************************************************************** */ -SQ_CategoriesView::SQ_CategoriesView(TQWidget *tqparent, const char *name) : KFileTreeView(tqparent, name) +SQ_CategoriesView::SQ_CategoriesView(TQWidget *parent, const char *name) : KFileTreeView(parent, name) { setAcceptDrops(true); @@ -151,7 +151,7 @@ void SQ_CategoriesView::slotItemExecuted(TQListViewItem *item) /* ************************************************************** */ -SQ_CategoriesBox::SQ_CategoriesBox(TQWidget *tqparent, const char *name) : TQVBox(tqparent, name) +SQ_CategoriesBox::SQ_CategoriesBox(TQWidget *parent, const char *name) : TQVBox(parent, name) { sing = this; @@ -222,7 +222,7 @@ void SQ_CategoriesBox::slotNewCategory() if(!cur) return; if(!cur->isDir()) - cur = static_cast<KFileTreeViewItem *>(cur->tqparent()); + cur = static_cast<KFileTreeViewItem *>(cur->parent()); if(!cur) return; @@ -235,9 +235,9 @@ void SQ_CategoriesBox::slotNewCategory() } } -void SQ_CategoriesBox::slotDropped(TQDropEvent *e, TQListViewItem *tqparent, TQListViewItem *item) +void SQ_CategoriesBox::slotDropped(TQDropEvent *e, TQListViewItem *parent, TQListViewItem *item) { - if(!item) item = tqparent; + if(!item) item = parent; KFileTreeViewItem *cur = static_cast<KFileTreeViewItem *>(item); diff --git a/ksquirrel/sidebar/sq_categoriesview.h b/ksquirrel/sidebar/sq_categoriesview.h index 177dc8f..0aa2c6d 100644 --- a/ksquirrel/sidebar/sq_categoriesview.h +++ b/ksquirrel/sidebar/sq_categoriesview.h @@ -42,7 +42,7 @@ class SQ_CategoriesViewBranch : public KFileTreeBranch ~SQ_CategoriesViewBranch(); protected: - virtual KFileTreeViewItem *createTreeViewItem(KFileTreeViewItem *tqparent, KFileItem *fileItem); + virtual KFileTreeViewItem *createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem); }; /* *************************************************** */ @@ -53,7 +53,7 @@ class SQ_CategoriesView : public KFileTreeView TQ_OBJECT public: - SQ_CategoriesView(TQWidget *tqparent = 0, const char *name = 0); + SQ_CategoriesView(TQWidget *parent = 0, const char *name = 0); ~SQ_CategoriesView(); SQ_TreeViewMenu *popupMenu() const; @@ -91,7 +91,7 @@ class SQ_CategoriesBox : public TQVBox TQ_OBJECT public: - SQ_CategoriesBox(TQWidget *tqparent = 0, const char *name = 0); + SQ_CategoriesBox(TQWidget *parent = 0, const char *name = 0); ~SQ_CategoriesBox(); /* diff --git a/ksquirrel/sidebar/sq_categorybrowsermenu.cpp b/ksquirrel/sidebar/sq_categorybrowsermenu.cpp index 3ef1127..f111e20 100644 --- a/ksquirrel/sidebar/sq_categorybrowsermenu.cpp +++ b/ksquirrel/sidebar/sq_categorybrowsermenu.cpp @@ -61,8 +61,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. TQMap<TQString, TQPixmap> *SQ_CategoryBrowserMenu::_icons = 0; -SQ_CategoryBrowserMenu::SQ_CategoryBrowserMenu(TQString path, TQWidget *tqparent, const char *name, int startid) - : KPanelMenu(path, tqparent, name) +SQ_CategoryBrowserMenu::SQ_CategoryBrowserMenu(TQString path, TQWidget *parent, const char *name, int startid) + : KPanelMenu(path, parent, name) , _mimecheckTimer(0) , _startid(startid) , _dirty(false) diff --git a/ksquirrel/sidebar/sq_categorybrowsermenu.h b/ksquirrel/sidebar/sq_categorybrowsermenu.h index 8045875..d8b87ea 100644 --- a/ksquirrel/sidebar/sq_categorybrowsermenu.h +++ b/ksquirrel/sidebar/sq_categorybrowsermenu.h @@ -42,7 +42,7 @@ class SQ_CategoryBrowserMenu : public KPanelMenu TQ_OBJECT public: - SQ_CategoryBrowserMenu(TQString path, TQWidget *tqparent = 0, const char *name = 0, int startid = 0); + SQ_CategoryBrowserMenu(TQString path, TQWidget *parent = 0, const char *name = 0, int startid = 0); ~SQ_CategoryBrowserMenu(); void append(const TQPixmap &pixmap, const TQString &title, const TQString &filename, bool mimecheck); diff --git a/ksquirrel/sidebar/sq_directorybasket.cpp b/ksquirrel/sidebar/sq_directorybasket.cpp index 1ee3eac..9bc756a 100644 --- a/ksquirrel/sidebar/sq_directorybasket.cpp +++ b/ksquirrel/sidebar/sq_directorybasket.cpp @@ -48,7 +48,7 @@ SQ_DirectoryBasket * SQ_DirectoryBasket::m_inst = 0; /* ******************************************************************************* */ -SQ_DBMenu::SQ_DBMenu(TQWidget *tqparent, const char *name) : SQ_TreeViewMenu(tqparent, name), item(0) +SQ_DBMenu::SQ_DBMenu(TQWidget *parent, const char *name) : SQ_TreeViewMenu(parent, name), item(0) { insertSeparator(); id_icon = insertItem(i18n("Change icon"), TQT_TQOBJECT(this), TQT_SLOT(slotChangeIcon())); @@ -122,8 +122,8 @@ SQ_DirectoryItem::SQ_DirectoryItem(KFileTreeViewItem *parentItem, KFileItem *fil : KFileTreeViewItem(parentItem, fileItem, parentBranch), m_index(0) {} -SQ_DirectoryItem::SQ_DirectoryItem(KFileTreeView *tqparent, KFileItem *fileItem, KFileTreeBranch *parentBranch) - : KFileTreeViewItem(tqparent, fileItem, parentBranch), m_index(0) +SQ_DirectoryItem::SQ_DirectoryItem(KFileTreeView *parent, KFileItem *fileItem, KFileTreeBranch *parentBranch) + : KFileTreeViewItem(parent, fileItem, parentBranch), m_index(0) {} SQ_DirectoryItem::~SQ_DirectoryItem() @@ -131,22 +131,22 @@ SQ_DirectoryItem::~SQ_DirectoryItem() /* ******************************************************************************* */ -SQ_DirectoryBasketBranch::SQ_DirectoryBasketBranch(KFileTreeView *tqparent, const KURL &url, const TQString &name, const TQPixmap &pix) - : KFileTreeBranch(tqparent, url, name, pix) +SQ_DirectoryBasketBranch::SQ_DirectoryBasketBranch(KFileTreeView *parent, const KURL &url, const TQString &name, const TQPixmap &pix) + : KFileTreeBranch(parent, url, name, pix) {} SQ_DirectoryBasketBranch::~SQ_DirectoryBasketBranch() {} -KFileTreeViewItem* SQ_DirectoryBasketBranch::createTreeViewItem(KFileTreeViewItem *tqparent, KFileItem *fileItem) +KFileTreeViewItem* SQ_DirectoryBasketBranch::createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem) { - if(!tqparent || !fileItem) + if(!parent || !fileItem) return 0; // hehe... fileItem->setMimeType("inode/directory"); - SQ_DirectoryItem *i = new SQ_DirectoryItem(tqparent, fileItem, this); + SQ_DirectoryItem *i = new SQ_DirectoryItem(parent, fileItem, this); if(i) { @@ -200,7 +200,7 @@ KFileTreeViewItem* SQ_DirectoryBasketBranch::createTreeViewItem(KFileTreeViewIte /* ******************************************************************************* */ -SQ_DirectoryBasket::SQ_DirectoryBasket(TQWidget *tqparent, const char *name) : KFileTreeView(tqparent, name) +SQ_DirectoryBasket::SQ_DirectoryBasket(TQWidget *parent, const char *name) : KFileTreeView(parent, name) { m_inst = this; @@ -307,7 +307,7 @@ void SQ_DirectoryBasket::slotDropped(TQDropEvent *e, TQListViewItem *_parent, TQ if(!_item) _item = _parent; SQ_DirectoryItem *item = static_cast<SQ_DirectoryItem *>(_item); - SQ_DirectoryItem *tqparent = static_cast<SQ_DirectoryItem *>(_parent); + SQ_DirectoryItem *parent = static_cast<SQ_DirectoryItem *>(_parent); KURL::List list; KURLDrag::decode(e, list); @@ -329,9 +329,9 @@ void SQ_DirectoryBasket::slotDropped(TQDropEvent *e, TQListViewItem *_parent, TQ if(it) { if(it != root->root()) - moveItem(tomove, tqparent, it); + moveItem(tomove, parent, it); else - moveItem(tomove, tqparent, 0); + moveItem(tomove, parent, 0); emit moved(); diff --git a/ksquirrel/sidebar/sq_directorybasket.h b/ksquirrel/sidebar/sq_directorybasket.h index 995d9ca..3d8f608 100644 --- a/ksquirrel/sidebar/sq_directorybasket.h +++ b/ksquirrel/sidebar/sq_directorybasket.h @@ -38,7 +38,7 @@ class SQ_DBMenu : public SQ_TreeViewMenu TQ_OBJECT public: - SQ_DBMenu(TQWidget *tqparent = 0, const char *name = 0); + SQ_DBMenu(TQWidget *parent = 0, const char *name = 0); ~SQ_DBMenu(); virtual void updateDirActions(bool, bool isroot = false); @@ -66,7 +66,7 @@ class SQ_DirectoryItem : public KFileTreeViewItem { public: SQ_DirectoryItem(KFileTreeViewItem *parentItem, KFileItem *fileItem, KFileTreeBranch *parentBranch); - SQ_DirectoryItem(KFileTreeView *tqparent, KFileItem *fileItem, KFileTreeBranch *parentBranch); + SQ_DirectoryItem(KFileTreeView *parent, KFileItem *fileItem, KFileTreeBranch *parentBranch); ~SQ_DirectoryItem(); int index() const; @@ -152,7 +152,7 @@ class SQ_DirectoryBasketBranch : public KFileTreeBranch ~SQ_DirectoryBasketBranch(); protected: - virtual KFileTreeViewItem *createTreeViewItem(KFileTreeViewItem *tqparent, KFileItem *fileItem); + virtual KFileTreeViewItem *createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem); }; class SQ_DirectoryBasket : public KFileTreeView @@ -161,7 +161,7 @@ class SQ_DirectoryBasket : public KFileTreeView TQ_OBJECT public: - SQ_DirectoryBasket(TQWidget *tqparent = 0, const char *name = 0); + SQ_DirectoryBasket(TQWidget *parent = 0, const char *name = 0); ~SQ_DirectoryBasket(); void add(const KFileItemList &list); diff --git a/ksquirrel/sidebar/sq_imagebasket.cpp b/ksquirrel/sidebar/sq_imagebasket.cpp index 8a080fd..9b2f665 100644 --- a/ksquirrel/sidebar/sq_imagebasket.cpp +++ b/ksquirrel/sidebar/sq_imagebasket.cpp @@ -38,7 +38,7 @@ SQ_ImageBasket * SQ_ImageBasket::m_inst; -SQ_ImageBasket::SQ_ImageBasket(TQWidget *tqparent, const char *name) : KDirOperator((dir = new SQ_Dir(SQ_Dir::Basket))->root(), tqparent, name) +SQ_ImageBasket::SQ_ImageBasket(TQWidget *parent, const char *name) : KDirOperator((dir = new SQ_Dir(SQ_Dir::Basket))->root(), parent, name) { m_inst = this; diff --git a/ksquirrel/sidebar/sq_imagebasket.h b/ksquirrel/sidebar/sq_imagebasket.h index d6882b0..4eb3bb4 100644 --- a/ksquirrel/sidebar/sq_imagebasket.h +++ b/ksquirrel/sidebar/sq_imagebasket.h @@ -32,7 +32,7 @@ class SQ_ImageBasket : public KDirOperator TQ_OBJECT public: - SQ_ImageBasket(TQWidget *tqparent = 0, const char *name = 0); + SQ_ImageBasket(TQWidget *parent = 0, const char *name = 0); ~SQ_ImageBasket(); void add(const KFileItemList &); diff --git a/ksquirrel/sidebar/sq_mountview.cpp b/ksquirrel/sidebar/sq_mountview.cpp index a605aab..7bb430a 100644 --- a/ksquirrel/sidebar/sq_mountview.cpp +++ b/ksquirrel/sidebar/sq_mountview.cpp @@ -34,7 +34,7 @@ SQ_MountView * SQ_MountView::m_inst = 0; -SQ_MountView::SQ_MountView(TQWidget *tqparent, const char *name) : KListView(tqparent, name), m_columns(-1) +SQ_MountView::SQ_MountView(TQWidget *parent, const char *name) : KListView(parent, name), m_columns(-1) { m_inst = this; diff --git a/ksquirrel/sidebar/sq_mountview.h b/ksquirrel/sidebar/sq_mountview.h index e6d5b2b..a899118 100644 --- a/ksquirrel/sidebar/sq_mountview.h +++ b/ksquirrel/sidebar/sq_mountview.h @@ -36,7 +36,7 @@ class SQ_MountView : public KListView TQ_OBJECT public: - SQ_MountView(TQWidget *tqparent = 0, const char *name = 0); + SQ_MountView(TQWidget *parent = 0, const char *name = 0); ~SQ_MountView(); enum { OPT_COL_MOUNTPOINT = 1, OPT_COL_DEVICE = 2, OPT_COL_FSTYPE = 4, OPT_COL_OPTIONS = 8 }; diff --git a/ksquirrel/sidebar/sq_mountviewitem.cpp b/ksquirrel/sidebar/sq_mountviewitem.cpp index 261f784..2dd200a 100644 --- a/ksquirrel/sidebar/sq_mountviewitem.cpp +++ b/ksquirrel/sidebar/sq_mountviewitem.cpp @@ -24,8 +24,8 @@ #include "sq_mountviewitem.h" #include "sq_iconloader.h" -SQ_MountViewItem::SQ_MountViewItem(KListView *tqparent, const TQString &mpoint) - : KListViewItem(tqparent, mpoint), m_mounted(false) +SQ_MountViewItem::SQ_MountViewItem(KListView *parent, const TQString &mpoint) + : KListViewItem(parent, mpoint), m_mounted(false) {} SQ_MountViewItem::~SQ_MountViewItem() diff --git a/ksquirrel/sidebar/sq_mountviewitem.h b/ksquirrel/sidebar/sq_mountviewitem.h index 9817a46..343a5fe 100644 --- a/ksquirrel/sidebar/sq_mountviewitem.h +++ b/ksquirrel/sidebar/sq_mountviewitem.h @@ -23,7 +23,7 @@ class SQ_MountViewItem : public KListViewItem { public: - SQ_MountViewItem(KListView *tqparent, const TQString &mpoint); + SQ_MountViewItem(KListView *parent, const TQString &mpoint); ~SQ_MountViewItem(); bool mounted() const; diff --git a/ksquirrel/sidebar/sq_multibar.cpp b/ksquirrel/sidebar/sq_multibar.cpp index 3f1ba27..e958705 100644 --- a/ksquirrel/sidebar/sq_multibar.cpp +++ b/ksquirrel/sidebar/sq_multibar.cpp @@ -34,7 +34,7 @@ SQ_MultiBar * SQ_MultiBar::m_inst = 0; -SQ_MultiBar::SQ_MultiBar(TQWidget *tqparent, const char *name) : TQHBox(tqparent, name) +SQ_MultiBar::SQ_MultiBar(TQWidget *parent, const char *name) : TQHBox(parent, name) { m_inst = this; m_id = 0; diff --git a/ksquirrel/sidebar/sq_multibar.h b/ksquirrel/sidebar/sq_multibar.h index 22fabee..aee4222 100644 --- a/ksquirrel/sidebar/sq_multibar.h +++ b/ksquirrel/sidebar/sq_multibar.h @@ -59,7 +59,7 @@ class SQ_MultiBar : public TQHBox TQ_OBJECT public: - SQ_MultiBar(TQWidget *tqparent = 0, const char *name = 0); + SQ_MultiBar(TQWidget *parent = 0, const char *name = 0); ~SQ_MultiBar(); /* diff --git a/ksquirrel/sidebar/sq_previewwidget.cpp b/ksquirrel/sidebar/sq_previewwidget.cpp index 1c85a93..7a889f7 100644 --- a/ksquirrel/sidebar/sq_previewwidget.cpp +++ b/ksquirrel/sidebar/sq_previewwidget.cpp @@ -48,8 +48,8 @@ SQ_PreviewWidget * SQ_PreviewWidget::m_inst = 0; -SQ_PreviewWidget::SQ_PreviewWidget(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name, TQt::WNoAutoErase), all(0), small(0), m_ignore(true) +SQ_PreviewWidget::SQ_PreviewWidget(TQWidget *parent, const char *name) + : TQWidget(parent, name, TQt::WNoAutoErase), all(0), small(0), m_ignore(true) { m_inst = this; diff --git a/ksquirrel/sidebar/sq_previewwidget.h b/ksquirrel/sidebar/sq_previewwidget.h index c79ce1f..4ce19d0 100644 --- a/ksquirrel/sidebar/sq_previewwidget.h +++ b/ksquirrel/sidebar/sq_previewwidget.h @@ -40,7 +40,7 @@ class SQ_PreviewWidget : public TQWidget TQ_OBJECT public: - SQ_PreviewWidget(TQWidget *tqparent = 0, const char *name = 0); + SQ_PreviewWidget(TQWidget *parent = 0, const char *name = 0); ~SQ_PreviewWidget(); void rereadColor(); diff --git a/ksquirrel/sidebar/sq_threaddirlister.h b/ksquirrel/sidebar/sq_threaddirlister.h index 7b8cd6c..aaa4ec6 100644 --- a/ksquirrel/sidebar/sq_threaddirlister.h +++ b/ksquirrel/sidebar/sq_threaddirlister.h @@ -39,8 +39,8 @@ class KConfig; class SQ_ItemsEvent : public TQCustomEvent { public: - SQ_ItemsEvent(const KURL &tqparent, int c1, int c2) - : TQCustomEvent(SQ_ItemsEventId), m_files(c1), m_dirs(c2), m_url(tqparent) + SQ_ItemsEvent(const KURL &parent, int c1, int c2) + : TQCustomEvent(SQ_ItemsEventId), m_files(c1), m_dirs(c2), m_url(parent) {} int files() const; diff --git a/ksquirrel/sidebar/sq_treeview.cpp b/ksquirrel/sidebar/sq_treeview.cpp index cdc42d2..e578530 100644 --- a/ksquirrel/sidebar/sq_treeview.cpp +++ b/ksquirrel/sidebar/sq_treeview.cpp @@ -45,26 +45,26 @@ SQ_TreeView * SQ_TreeView::m_instance = 0; -SQ_FileTreeViewBranch::SQ_FileTreeViewBranch(KFileTreeView *tqparent, const KURL &url, - const TQString &name, const TQPixmap &pix) : KFileTreeBranch(tqparent, url, name, pix) +SQ_FileTreeViewBranch::SQ_FileTreeViewBranch(KFileTreeView *parent, const KURL &url, + const TQString &name, const TQPixmap &pix) : KFileTreeBranch(parent, url, name, pix) {} SQ_FileTreeViewBranch::~SQ_FileTreeViewBranch() {} -KFileTreeViewItem* SQ_FileTreeViewBranch::createTreeViewItem(KFileTreeViewItem *tqparent, KFileItem *fileItem) +KFileTreeViewItem* SQ_FileTreeViewBranch::createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem) { KFileTreeViewItem *tvi = 0; - if(tqparent && fileItem) - tvi = new SQ_TreeViewItem(tqparent, fileItem, this); + if(parent && fileItem) + tvi = new SQ_TreeViewItem(parent, fileItem, this); return tvi; } /******************************************************************************************************/ -SQ_TreeView::SQ_TreeView(TQWidget *tqparent, const char *name) : KFileTreeView(tqparent, name) +SQ_TreeView::SQ_TreeView(TQWidget *parent, const char *name) : KFileTreeView(parent, name) { m_instance = this; @@ -552,7 +552,7 @@ void SQ_TreeView::contentsMousePressEvent(TQMouseEvent *e) { TQListViewItemIterator it(this); - // toggle tqparent item + // toggle parent item if(state == TQt::ShiftButton) toggle(m, true); else if(state == TQt::ControlButton) toggle(m, false, true); else if(state == TQt::AltButton) toggle(m, false, false); @@ -609,9 +609,9 @@ void SQ_TreeView::toggle(SQ_TreeViewItem *item, bool togg, bool set) emit urlRemoved(item->url()); } -void SQ_TreeView::slotDropped(TQDropEvent *e, TQListViewItem *tqparent, TQListViewItem *item) +void SQ_TreeView::slotDropped(TQDropEvent *e, TQListViewItem *parent, TQListViewItem *item) { - if(!item) item = tqparent; + if(!item) item = parent; KFileTreeViewItem *cur = static_cast<KFileTreeViewItem *>(item); diff --git a/ksquirrel/sidebar/sq_treeview.h b/ksquirrel/sidebar/sq_treeview.h index e12ebdb..646dad7 100644 --- a/ksquirrel/sidebar/sq_treeview.h +++ b/ksquirrel/sidebar/sq_treeview.h @@ -40,7 +40,7 @@ class SQ_FileTreeViewBranch : public KFileTreeBranch ~SQ_FileTreeViewBranch(); protected: - virtual KFileTreeViewItem *createTreeViewItem(KFileTreeViewItem *tqparent, KFileItem *fileItem); + virtual KFileTreeViewItem *createTreeViewItem(KFileTreeViewItem *parent, KFileItem *fileItem); }; /* @@ -53,7 +53,7 @@ class SQ_TreeView : public KFileTreeView TQ_OBJECT public: - SQ_TreeView(TQWidget *tqparent = 0, const char *name = 0); + SQ_TreeView(TQWidget *parent = 0, const char *name = 0); ~SQ_TreeView(); enum Recursion { No = 0, Files, Dirs, FilesDirs }; diff --git a/ksquirrel/sidebar/sq_treeviewitem.cpp b/ksquirrel/sidebar/sq_treeviewitem.cpp index 8d6500f..9ad313c 100644 --- a/ksquirrel/sidebar/sq_treeviewitem.cpp +++ b/ksquirrel/sidebar/sq_treeviewitem.cpp @@ -28,8 +28,8 @@ SQ_TreeViewItem::SQ_TreeViewItem(KFileTreeViewItem *parentItem, KFileItem *fileI m_checked(false), count_files(0), count_dirs(0), use_c1(false), use_c2(false) {} -SQ_TreeViewItem::SQ_TreeViewItem(KFileTreeView *tqparent, KFileItem *fileItem, KFileTreeBranch *parentBranch) - : KFileTreeViewItem(tqparent, fileItem, parentBranch), +SQ_TreeViewItem::SQ_TreeViewItem(KFileTreeView *parent, KFileItem *fileItem, KFileTreeBranch *parentBranch) + : KFileTreeViewItem(parent, fileItem, parentBranch), m_checked(false), count_files(0), count_dirs(0), use_c1(false), use_c2(false) {} diff --git a/ksquirrel/sidebar/sq_treeviewitem.h b/ksquirrel/sidebar/sq_treeviewitem.h index a544ca9..64a2059 100644 --- a/ksquirrel/sidebar/sq_treeviewitem.h +++ b/ksquirrel/sidebar/sq_treeviewitem.h @@ -26,7 +26,7 @@ class SQ_TreeViewItem : public KFileTreeViewItem { public: SQ_TreeViewItem(KFileTreeViewItem *parentItem, KFileItem *fileItem, KFileTreeBranch *parentBranch); - SQ_TreeViewItem(KFileTreeView *tqparent, KFileItem *fileItem, KFileTreeBranch *parentBranch); + SQ_TreeViewItem(KFileTreeView *parent, KFileItem *fileItem, KFileTreeBranch *parentBranch); ~SQ_TreeViewItem(); bool checked() const; diff --git a/ksquirrel/sidebar/sq_treeviewmenu.cpp b/ksquirrel/sidebar/sq_treeviewmenu.cpp index 2413d4c..db75998 100644 --- a/ksquirrel/sidebar/sq_treeviewmenu.cpp +++ b/ksquirrel/sidebar/sq_treeviewmenu.cpp @@ -13,7 +13,7 @@ #include "ksquirrel.h" #include "sq_iconloader.h" -SQ_TreeViewMenu::SQ_TreeViewMenu(TQWidget *tqparent, const char *name) : KPopupMenu(tqparent, name) +SQ_TreeViewMenu::SQ_TreeViewMenu(TQWidget *parent, const char *name) : KPopupMenu(parent, name) { id_new = insertItem(SQ_IconLoader::instance()->loadIcon("folder_new", KIcon::Desktop, KIcon::SizeSmall), i18n("New folder..."), this, TQT_SLOT(slotDirectoryNew())); insertSeparator(); diff --git a/ksquirrel/sidebar/sq_treeviewmenu.h b/ksquirrel/sidebar/sq_treeviewmenu.h index de01cad..b788ffd 100644 --- a/ksquirrel/sidebar/sq_treeviewmenu.h +++ b/ksquirrel/sidebar/sq_treeviewmenu.h @@ -14,7 +14,7 @@ class SQ_TreeViewMenu : public KPopupMenu TQ_OBJECT public: - SQ_TreeViewMenu(TQWidget *tqparent = 0, const char *name = 0); + SQ_TreeViewMenu(TQWidget *parent = 0, const char *name = 0); virtual ~SQ_TreeViewMenu(); enum Element { New, Rename, Delete, Properties, Clear }; diff --git a/ksquirrel/sq_archivehandler.cpp b/ksquirrel/sq_archivehandler.cpp index fab4f97..9cb9ce4 100644 --- a/ksquirrel/sq_archivehandler.cpp +++ b/ksquirrel/sq_archivehandler.cpp @@ -21,8 +21,8 @@ SQ_ArchiveHandler * SQ_ArchiveHandler::m_instance = 0; -SQ_ArchiveHandler::SQ_ArchiveHandler(TQObject * tqparent, const char *name) - : TQObject(tqparent, name), TQMap<TQString, TQString>() +SQ_ArchiveHandler::SQ_ArchiveHandler(TQObject * parent, const char *name) + : TQObject(parent, name), TQMap<TQString, TQString>() { m_instance = this; diff --git a/ksquirrel/sq_archivehandler.h b/ksquirrel/sq_archivehandler.h index 5ee0d6a..7955eaa 100644 --- a/ksquirrel/sq_archivehandler.h +++ b/ksquirrel/sq_archivehandler.h @@ -29,7 +29,7 @@ class SQ_ArchiveHandler : public TQObject, TQMap<TQString, TQString> TQ_OBJECT public: - SQ_ArchiveHandler(TQObject *tqparent = 0, const char *name = 0); + SQ_ArchiveHandler(TQObject *parent = 0, const char *name = 0); ~SQ_ArchiveHandler(); /* diff --git a/ksquirrel/sq_bookmarkowner.cpp b/ksquirrel/sq_bookmarkowner.cpp index 83d544a..24b6d86 100644 --- a/ksquirrel/sq_bookmarkowner.cpp +++ b/ksquirrel/sq_bookmarkowner.cpp @@ -23,7 +23,7 @@ SQ_BookmarkOwner * SQ_BookmarkOwner::m_instance = 0; -SQ_BookmarkOwner::SQ_BookmarkOwner(TQWidget *tqparent) : TQObject(tqparent) +SQ_BookmarkOwner::SQ_BookmarkOwner(TQWidget *parent) : TQObject(parent) { m_instance = this; } diff --git a/ksquirrel/sq_bookmarkowner.h b/ksquirrel/sq_bookmarkowner.h index 7c9894f..7f1e6c9 100644 --- a/ksquirrel/sq_bookmarkowner.h +++ b/ksquirrel/sq_bookmarkowner.h @@ -35,7 +35,7 @@ class SQ_BookmarkOwner : public TQObject, public KBookmarkOwner TQ_OBJECT public: - SQ_BookmarkOwner(TQWidget *tqparent = 0); + SQ_BookmarkOwner(TQWidget *parent = 0); virtual ~SQ_BookmarkOwner(); /* diff --git a/ksquirrel/sq_config.cpp b/ksquirrel/sq_config.cpp index 9cc2b82..8e6e0fa 100644 --- a/ksquirrel/sq_config.cpp +++ b/ksquirrel/sq_config.cpp @@ -23,7 +23,7 @@ SQ_Config * SQ_Config::m_instance = 0; -SQ_Config::SQ_Config(TQObject *tqparent) : TQObject(tqparent) +SQ_Config::SQ_Config(TQObject *parent) : TQObject(parent) { m_instance = this; diff --git a/ksquirrel/sq_config.h b/ksquirrel/sq_config.h index 4415d18..438a8e7 100644 --- a/ksquirrel/sq_config.h +++ b/ksquirrel/sq_config.h @@ -30,7 +30,7 @@ class KConfig; class SQ_Config : public TQObject { public: - SQ_Config(TQObject *tqparent = 0); + SQ_Config(TQObject *parent = 0); ~SQ_Config(); static SQ_Config* instance() { return m_instance; } diff --git a/ksquirrel/sq_diroperator.cpp b/ksquirrel/sq_diroperator.cpp index 727f6b6..06232c9 100644 --- a/ksquirrel/sq_diroperator.cpp +++ b/ksquirrel/sq_diroperator.cpp @@ -67,8 +67,8 @@ static const int SQ_MAX_WORD_LENGTH = 50; -SQ_DirOperator::SQ_DirOperator(const KURL &url, ViewT type_, TQWidget *tqparent, const char *name) - : KDirOperator(url, tqparent, name), type(type_) +SQ_DirOperator::SQ_DirOperator(const KURL &url, ViewT type_, TQWidget *parent, const char *name) + : KDirOperator(url, parent, name), type(type_) { usenew = false; diff --git a/ksquirrel/sq_diroperator.h b/ksquirrel/sq_diroperator.h index fa607e2..d028744 100644 --- a/ksquirrel/sq_diroperator.h +++ b/ksquirrel/sq_diroperator.h @@ -54,7 +54,7 @@ class SQ_DirOperator : public KDirOperator * View type is determined by 'type_'. */ SQ_DirOperator(const KURL &url = KURL(), ViewT type_ = SQ_DirOperator::TypeList, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); ~SQ_DirOperator(); @@ -121,7 +121,7 @@ class SQ_DirOperator : public KDirOperator /* * Reimplement createView() to create custom views. */ - virtual KFileView* createView(TQWidget *tqparent, KFile::FileView view); + virtual KFileView* createView(TQWidget *parent, KFile::FileView view); private: void itemKill(KFileItem *); diff --git a/ksquirrel/sq_downloader.cpp b/ksquirrel/sq_downloader.cpp index 07759dc..31fecc5 100644 --- a/ksquirrel/sq_downloader.cpp +++ b/ksquirrel/sq_downloader.cpp @@ -30,7 +30,7 @@ #define SQ_PREDOWNLOAD_SIZE 50 -SQ_Downloader::SQ_Downloader(TQObject *tqparent, const char *name) : TQObject(tqparent, name), job(0), m_error(false) +SQ_Downloader::SQ_Downloader(TQObject *parent, const char *name) : TQObject(parent, name), job(0), m_error(false) { tmp = new KTempFile; tmp->setAutoDelete(true); diff --git a/ksquirrel/sq_downloader.h b/ksquirrel/sq_downloader.h index 949af80..dbb03f3 100644 --- a/ksquirrel/sq_downloader.h +++ b/ksquirrel/sq_downloader.h @@ -34,7 +34,7 @@ class SQ_Downloader : public TQObject TQ_OBJECT public: - SQ_Downloader(TQObject *tqparent = 0, const char *name = 0); + SQ_Downloader(TQObject *parent = 0, const char *name = 0); ~SQ_Downloader(); void start(KFileItem *fi); diff --git a/ksquirrel/sq_dragprovider.cpp b/ksquirrel/sq_dragprovider.cpp index 69ae6b3..43a67bd 100644 --- a/ksquirrel/sq_dragprovider.cpp +++ b/ksquirrel/sq_dragprovider.cpp @@ -40,7 +40,7 @@ SQ_DragProvider * SQ_DragProvider::m_inst = 0; -SQ_DragProvider::SQ_DragProvider(TQObject *tqparent) : TQObject(tqparent), source(0) +SQ_DragProvider::SQ_DragProvider(TQObject *parent) : TQObject(parent), source(0) { m_inst = this; } diff --git a/ksquirrel/sq_dragprovider.h b/ksquirrel/sq_dragprovider.h index e8c5d17..7607d09 100644 --- a/ksquirrel/sq_dragprovider.h +++ b/ksquirrel/sq_dragprovider.h @@ -36,7 +36,7 @@ class SQ_DragProvider : public TQObject public: enum SourceType { Icons, Thumbnails }; - SQ_DragProvider(TQObject *tqparent); + SQ_DragProvider(TQObject *parent); ~SQ_DragProvider(); /* diff --git a/ksquirrel/sq_errorstring.cpp b/ksquirrel/sq_errorstring.cpp index dcbdb90..cd5a047 100644 --- a/ksquirrel/sq_errorstring.cpp +++ b/ksquirrel/sq_errorstring.cpp @@ -25,7 +25,7 @@ SQ_ErrorString * SQ_ErrorString::m_instance = 0; -SQ_ErrorString::SQ_ErrorString(TQObject *tqparent) : TQObject(tqparent) +SQ_ErrorString::SQ_ErrorString(TQObject *parent) : TQObject(parent) { m_instance = this; diff --git a/ksquirrel/sq_errorstring.h b/ksquirrel/sq_errorstring.h index 469fe47..b0df250 100644 --- a/ksquirrel/sq_errorstring.h +++ b/ksquirrel/sq_errorstring.h @@ -33,7 +33,7 @@ class SQ_ErrorString : public TQObject { public: - SQ_ErrorString(TQObject *tqparent = 0); + SQ_ErrorString(TQObject *parent = 0); ~SQ_ErrorString(); /* diff --git a/ksquirrel/sq_externaltool.cpp b/ksquirrel/sq_externaltool.cpp index adc0fda..cd5a5f7 100644 --- a/ksquirrel/sq_externaltool.cpp +++ b/ksquirrel/sq_externaltool.cpp @@ -45,7 +45,7 @@ Tool::Tool(const TQString &pix, const TQString &nam, const TQString &com) command = com; } -SQ_ExternalTool::SQ_ExternalTool(TQObject *tqparent) : TQObject(tqparent), TQValueVector<Tool>() +SQ_ExternalTool::SQ_ExternalTool(TQObject *parent) : TQObject(parent), TQValueVector<Tool>() { m_instance = this; menu = new SQ_PopupMenu(0, "External tools"); diff --git a/ksquirrel/sq_externaltool.h b/ksquirrel/sq_externaltool.h index a2c0e8a..1def26b 100644 --- a/ksquirrel/sq_externaltool.h +++ b/ksquirrel/sq_externaltool.h @@ -46,7 +46,7 @@ class SQ_ExternalTool : public TQObject, public TQValueVector<Tool> TQ_OBJECT public: - SQ_ExternalTool(TQObject *tqparent = 0); + SQ_ExternalTool(TQObject *parent = 0); ~SQ_ExternalTool(); /* diff --git a/ksquirrel/sq_filedetailview.cpp b/ksquirrel/sq_filedetailview.cpp index f1dfc58..d60257e 100644 --- a/ksquirrel/sq_filedetailview.cpp +++ b/ksquirrel/sq_filedetailview.cpp @@ -35,18 +35,18 @@ #include "sq_diroperator.h" #include "sq_dragprovider.h" -SQ_FileListViewItem::SQ_FileListViewItem(TQListView *tqparent, KFileItem *fi) : KFileListViewItem(tqparent, fi) +SQ_FileListViewItem::SQ_FileListViewItem(TQListView *parent, KFileItem *fi) : KFileListViewItem(parent, fi) {} -SQ_FileListViewItem::SQ_FileListViewItem(TQListView *tqparent, const TQString &text, const TQPixmap &icon, KFileItem *fi) - : KFileListViewItem(tqparent, text, icon, fi) +SQ_FileListViewItem::SQ_FileListViewItem(TQListView *parent, const TQString &text, const TQPixmap &icon, KFileItem *fi) + : KFileListViewItem(parent, text, icon, fi) {} SQ_FileListViewItem::~SQ_FileListViewItem() {} -SQ_FileDetailView::SQ_FileDetailView(TQWidget* tqparent, const char* name) - : KFileDetailView(tqparent, name) +SQ_FileDetailView::SQ_FileDetailView(TQWidget* parent, const char* name) + : KFileDetailView(parent, name) { // pixmap for directory item dirPix = SQ_IconLoader::instance()->loadIcon("folder", KIcon::Desktop, KIcon::SizeSmall); diff --git a/ksquirrel/sq_filedetailview.h b/ksquirrel/sq_filedetailview.h index baacaf8..1f21f73 100644 --- a/ksquirrel/sq_filedetailview.h +++ b/ksquirrel/sq_filedetailview.h @@ -32,8 +32,8 @@ class KonqFileTip; class SQ_FileListViewItem : public KFileListViewItem { public: - SQ_FileListViewItem(TQListView *tqparent, KFileItem *fi); - SQ_FileListViewItem(TQListView *tqparent, const TQString &text, const TQPixmap &icon, KFileItem *fi); + SQ_FileListViewItem(TQListView *parent, KFileItem *fi); + SQ_FileListViewItem(TQListView *parent, const TQString &text, const TQPixmap &icon, KFileItem *fi); ~SQ_FileListViewItem(); protected: @@ -50,7 +50,7 @@ class SQ_FileDetailView : public KFileDetailView TQ_OBJECT public: - SQ_FileDetailView(TQWidget* tqparent, const char* name); + SQ_FileDetailView(TQWidget* parent, const char* name); ~SQ_FileDetailView(); /* diff --git a/ksquirrel/sq_filedialog.cpp b/ksquirrel/sq_filedialog.cpp index 6e8fb82..3b883b5 100644 --- a/ksquirrel/sq_filedialog.cpp +++ b/ksquirrel/sq_filedialog.cpp @@ -19,8 +19,8 @@ #include "sq_filedialog.h" -SQ_FileDialog::SQ_FileDialog(const TQString &path, TQWidget *tqparent) - : KFileDialog(path, TQString(), tqparent, "select_a_file", true) +SQ_FileDialog::SQ_FileDialog(const TQString &path, TQWidget *parent) + : KFileDialog(path, TQString(), parent, "select_a_file", true) {} SQ_FileDialog::~SQ_FileDialog() diff --git a/ksquirrel/sq_filedialog.h b/ksquirrel/sq_filedialog.h index 3c68956..6286c1b 100644 --- a/ksquirrel/sq_filedialog.h +++ b/ksquirrel/sq_filedialog.h @@ -27,7 +27,7 @@ class SQ_FileDialog : public KFileDialog { public: - SQ_FileDialog(const TQString &path, TQWidget *tqparent); + SQ_FileDialog(const TQString &path, TQWidget *parent); ~SQ_FileDialog(); TQString nameFilter() const; diff --git a/ksquirrel/sq_fileiconview.cpp b/ksquirrel/sq_fileiconview.cpp index d556c49..b47a127 100644 --- a/ksquirrel/sq_fileiconview.cpp +++ b/ksquirrel/sq_fileiconview.cpp @@ -31,15 +31,15 @@ #include "sq_diroperator.h" #include "sq_dragprovider.h" -SQ_FileIconViewItem::SQ_FileIconViewItem(TQIconView *tqparent, const TQString &text, +SQ_FileIconViewItem::SQ_FileIconViewItem(TQIconView *parent, const TQString &text, const TQPixmap &pixmap, KFileItem *fi) - : KFileIconViewItem(tqparent, text, pixmap, fi) + : KFileIconViewItem(parent, text, pixmap, fi) {} SQ_FileIconViewItem::~SQ_FileIconViewItem() {} -SQ_FileIconView::SQ_FileIconView(TQWidget *tqparent, const char *name) : SQ_FileIconViewBase(tqparent, name) +SQ_FileIconView::SQ_FileIconView(TQWidget *parent, const char *name) : SQ_FileIconViewBase(parent, name) { TQString n = name; diff --git a/ksquirrel/sq_fileiconview.h b/ksquirrel/sq_fileiconview.h index 50fc0ef..3a03411 100644 --- a/ksquirrel/sq_fileiconview.h +++ b/ksquirrel/sq_fileiconview.h @@ -34,7 +34,7 @@ class TQPoint; class SQ_FileIconViewItem : public KFileIconViewItem { public: - SQ_FileIconViewItem(TQIconView *tqparent, const TQString &text, const TQPixmap &pixmap, KFileItem *fi); + SQ_FileIconViewItem(TQIconView *parent, const TQString &text, const TQPixmap &pixmap, KFileItem *fi); ~SQ_FileIconViewItem(); protected: @@ -51,7 +51,7 @@ class SQ_FileIconView : public SQ_FileIconViewBase TQ_OBJECT public: - SQ_FileIconView(TQWidget *tqparent = 0, const char *name = ""); + SQ_FileIconView(TQWidget *parent = 0, const char *name = ""); ~SQ_FileIconView(); /* diff --git a/ksquirrel/sq_fileiconviewbase.cpp b/ksquirrel/sq_fileiconviewbase.cpp index d9211f1..4f230a6 100644 --- a/ksquirrel/sq_fileiconviewbase.cpp +++ b/ksquirrel/sq_fileiconviewbase.cpp @@ -32,8 +32,8 @@ #include "sq_fileiconviewbase.h" #include "sq_config.h" -SQ_FileIconViewBase::SQ_FileIconViewBase(TQWidget *tqparent, const char *name) - : KFileIconView(tqparent, name) +SQ_FileIconViewBase::SQ_FileIconViewBase(TQWidget *parent, const char *name) + : KFileIconView(parent, name) { toolTip = new KonqFileTip(this); slotResetToolTip(); diff --git a/ksquirrel/sq_fileiconviewbase.h b/ksquirrel/sq_fileiconviewbase.h index 4111e39..6ade3ca 100644 --- a/ksquirrel/sq_fileiconviewbase.h +++ b/ksquirrel/sq_fileiconviewbase.h @@ -33,7 +33,7 @@ class SQ_FileIconViewBase : public KFileIconView TQ_OBJECT public: - SQ_FileIconViewBase(TQWidget *tqparent = 0, const char *name = 0); + SQ_FileIconViewBase(TQWidget *parent = 0, const char *name = 0); virtual ~SQ_FileIconViewBase(); virtual void insertCdUpItem(const KURL &base) = 0; diff --git a/ksquirrel/sq_filethumbview.cpp b/ksquirrel/sq_filethumbview.cpp index cb95b3e..fe824ca 100644 --- a/ksquirrel/sq_filethumbview.cpp +++ b/ksquirrel/sq_filethumbview.cpp @@ -49,7 +49,7 @@ #include "sq_filethumbviewitem.h" #include "sq_dragprovider.h" -SQ_FileThumbView::SQ_FileThumbView(TQWidget *tqparent, const char *name) : SQ_FileIconViewBase(tqparent, name), isPending(false) +SQ_FileThumbView::SQ_FileThumbView(TQWidget *parent, const char *name) : SQ_FileIconViewBase(parent, name), isPending(false) { // create progress bar m_progressBox = new SQ_ProgressBox(this); diff --git a/ksquirrel/sq_filethumbview.h b/ksquirrel/sq_filethumbview.h index fa6ea59..9887524 100644 --- a/ksquirrel/sq_filethumbview.h +++ b/ksquirrel/sq_filethumbview.h @@ -43,7 +43,7 @@ class SQ_FileThumbView : public SQ_FileIconViewBase TQ_OBJECT public: - SQ_FileThumbView(TQWidget *tqparent = 0, const char *name = ""); + SQ_FileThumbView(TQWidget *parent = 0, const char *name = ""); ~SQ_FileThumbView(); bool lazy() const; diff --git a/ksquirrel/sq_filethumbviewitem.cpp b/ksquirrel/sq_filethumbviewitem.cpp index 4d966cc..99a7a68 100644 --- a/ksquirrel/sq_filethumbviewitem.cpp +++ b/ksquirrel/sq_filethumbviewitem.cpp @@ -26,8 +26,8 @@ #include "sq_filethumbviewitem.h" -SQ_FileThumbViewItem::SQ_FileThumbViewItem(TQIconView *tqparent, const TQString &text, const TQPixmap &pixmap, KFileItem *fi): - KFileIconViewItem(tqparent, text, pixmap, fi), m_listed(false) +SQ_FileThumbViewItem::SQ_FileThumbViewItem(TQIconView *parent, const TQString &text, const TQPixmap &pixmap, KFileItem *fi): + KFileIconViewItem(parent, text, pixmap, fi), m_listed(false) {} SQ_FileThumbViewItem::~SQ_FileThumbViewItem() diff --git a/ksquirrel/sq_filethumbviewitem.h b/ksquirrel/sq_filethumbviewitem.h index 7e556de..3a8edad 100644 --- a/ksquirrel/sq_filethumbviewitem.h +++ b/ksquirrel/sq_filethumbviewitem.h @@ -30,7 +30,7 @@ class SQ_FileThumbViewItem : public KFileIconViewItem { public: - SQ_FileThumbViewItem(TQIconView *tqparent, const TQString &text, const TQPixmap &pixmap, KFileItem *fi); + SQ_FileThumbViewItem(TQIconView *parent, const TQString &text, const TQPixmap &pixmap, KFileItem *fi); ~SQ_FileThumbViewItem(); bool listed() const; diff --git a/ksquirrel/sq_glview.cpp b/ksquirrel/sq_glview.cpp index ab62530..681f499 100644 --- a/ksquirrel/sq_glview.cpp +++ b/ksquirrel/sq_glview.cpp @@ -46,7 +46,7 @@ SQ_GLView * SQ_GLView::m_instance = 0; -SQ_GLView::SQ_GLView(TQWidget *tqparent) : TQVBox(tqparent, "ksquirrel-image-window") +SQ_GLView::SQ_GLView(TQWidget *parent) : TQVBox(parent, "ksquirrel-image-window") { m_instance = this; @@ -209,7 +209,7 @@ void SQ_GLView::resetStatusBar() names["SBFrame"]->setText(TQString::tqfromLatin1("0/0")); } -SQ_ToolBar::SQ_ToolBar(TQWidget *tqparent) : KToolBar(tqparent) +SQ_ToolBar::SQ_ToolBar(TQWidget *parent) : KToolBar(parent) { setFixedHeight(SQ_ToolButton::fixedWidth() + 5); boxLayout()->setSpacing(0); diff --git a/ksquirrel/sq_glview.h b/ksquirrel/sq_glview.h index 6841f04..102c0eb 100644 --- a/ksquirrel/sq_glview.h +++ b/ksquirrel/sq_glview.h @@ -36,7 +36,7 @@ class TQLabel; class SQ_ToolBar : public KToolBar { public: - SQ_ToolBar(TQWidget *tqparent); + SQ_ToolBar(TQWidget *parent); ~SQ_ToolBar(); protected: @@ -75,7 +75,7 @@ class SQ_GLView : public TQVBox TQ_OBJECT public: - SQ_GLView(TQWidget *tqparent = 0); + SQ_GLView(TQWidget *parent = 0); ~SQ_GLView(); void leftTab(); diff --git a/ksquirrel/sq_glwidget.cpp b/ksquirrel/sq_glwidget.cpp index 5c2fa4c..4891e6f 100644 --- a/ksquirrel/sq_glwidget.cpp +++ b/ksquirrel/sq_glwidget.cpp @@ -105,7 +105,7 @@ static const float SQ_ONSCREEN_LAYER = 10000.0; /* ***************************************************************************************** */ -SQ_GLWidget::SQ_GLWidget(TQWidget *tqparent, const char *name) : TQGLWidget(tqparent, name) +SQ_GLWidget::SQ_GLWidget(TQWidget *parent, const char *name) : TQGLWidget(parent, name) { kdDebug() << "+SQ_GLWidget" << endl; diff --git a/ksquirrel/sq_glwidget.h b/ksquirrel/sq_glwidget.h index 2c9ee58..bb092a9 100644 --- a/ksquirrel/sq_glwidget.h +++ b/ksquirrel/sq_glwidget.h @@ -127,7 +127,7 @@ class SQ_GLWidget : public TQGLWidget TQ_OBJECT public: - SQ_GLWidget(TQWidget *tqparent = 0, const char *name = 0); + SQ_GLWidget(TQWidget *parent = 0, const char *name = 0); ~SQ_GLWidget(); void setDownloadPercents(int); diff --git a/ksquirrel/sq_glwidget_helpers.cpp b/ksquirrel/sq_glwidget_helpers.cpp index f501478..6b770f8 100644 --- a/ksquirrel/sq_glwidget_helpers.cpp +++ b/ksquirrel/sq_glwidget_helpers.cpp @@ -36,8 +36,8 @@ #include "sq_glwidget_helpers.h" -SQ_ToolButtonPopup::SQ_ToolButtonPopup(const TQPixmap &pix, const TQString &textLabel, KToolBar *tqparent) - : KToolBarButton(pix, -1, tqparent, 0, textLabel) +SQ_ToolButtonPopup::SQ_ToolButtonPopup(const TQPixmap &pix, const TQString &textLabel, KToolBar *parent) + : KToolBarButton(pix, -1, parent, 0, textLabel) { setFixedWidth(SQ_ToolButton::fixedWidth()); } @@ -46,8 +46,8 @@ SQ_ToolButtonPopup::~SQ_ToolButtonPopup() {} SQ_ToolButton::SQ_ToolButton(const TQIconSet &iconSet, const TQString &textLabel, - TQObject *receiver, const char *slot, KToolBar *tqparent, const char *name) - : TQToolButton(iconSet, textLabel, TQString(), receiver, slot, tqparent, name) + TQObject *receiver, const char *slot, KToolBar *parent, const char *name) + : TQToolButton(iconSet, textLabel, TQString(), receiver, slot, parent, name) { setFixedWidth(SQ_ToolButton::fixedWidth()); } diff --git a/ksquirrel/sq_glwidget_helpers.h b/ksquirrel/sq_glwidget_helpers.h index 12dacfa..18e1956 100644 --- a/ksquirrel/sq_glwidget_helpers.h +++ b/ksquirrel/sq_glwidget_helpers.h @@ -29,7 +29,7 @@ struct RGBA; class SQ_ToolButtonPopup : public KToolBarButton { public: - SQ_ToolButtonPopup(const TQPixmap &pix, const TQString &textLabel, KToolBar *tqparent); + SQ_ToolButtonPopup(const TQPixmap &pix, const TQString &textLabel, KToolBar *parent); ~SQ_ToolButtonPopup(); }; @@ -37,7 +37,7 @@ class SQ_ToolButton : public TQToolButton { public: SQ_ToolButton(const TQIconSet &iconSet, const TQString &textLabel, TQObject *receiver, - const char *slot, KToolBar *tqparent, const char *name = 0); + const char *slot, KToolBar *parent, const char *name = 0); ~SQ_ToolButton(); static int fixedWidth(); diff --git a/ksquirrel/sq_iconlistbox.cpp b/ksquirrel/sq_iconlistbox.cpp index e0ceb3e..d50bee2 100644 --- a/ksquirrel/sq_iconlistbox.cpp +++ b/ksquirrel/sq_iconlistbox.cpp @@ -22,7 +22,7 @@ #include "sq_iconlistbox.h" #include "sq_iconlistitem.h" -SQ_IconListBox::SQ_IconListBox(TQWidget *tqparent, const char *name, WFlags f) : KListBox(tqparent, name, f), +SQ_IconListBox::SQ_IconListBox(TQWidget *parent, const char *name, WFlags f) : KListBox(parent, name, f), mHeightValid(false), mWidthValid(false) { setHScrollBarMode(TQScrollView::AlwaysOff); diff --git a/ksquirrel/sq_iconlistitem.cpp b/ksquirrel/sq_iconlistitem.cpp index 821e7cd..7bf06b3 100644 --- a/ksquirrel/sq_iconlistitem.cpp +++ b/ksquirrel/sq_iconlistitem.cpp @@ -58,14 +58,14 @@ const TQPixmap& SQ_IconListItem::defaultPixmap() p.drawRect(0, 0, pix->width(), pix->height()); p.end(); - TQBitmap tqmask(pix->width(), pix->height(), true); - tqmask.fill(TQt::black); - p.begin(&tqmask); + TQBitmap mask(pix->width(), pix->height(), true); + mask.fill(TQt::black); + p.begin(&mask); p.setPen(TQt::white); p.drawRect(0, 0, pix->width(), pix->height()); p.end(); - pix->setMask(tqmask); + pix->setMask(mask); } return *pix; diff --git a/ksquirrel/sq_iconloader.cpp b/ksquirrel/sq_iconloader.cpp index 91feec2..05fbd12 100644 --- a/ksquirrel/sq_iconloader.cpp +++ b/ksquirrel/sq_iconloader.cpp @@ -27,7 +27,7 @@ SQ_IconLoader * SQ_IconLoader::m_instance = 0; -SQ_IconLoader::SQ_IconLoader(TQObject *tqparent) : TQObject(tqparent) +SQ_IconLoader::SQ_IconLoader(TQObject *parent) : TQObject(parent) { m_instance = this; diff --git a/ksquirrel/sq_iconloader.h b/ksquirrel/sq_iconloader.h index 2c40530..a49ee11 100644 --- a/ksquirrel/sq_iconloader.h +++ b/ksquirrel/sq_iconloader.h @@ -32,7 +32,7 @@ class SQ_IconLoader : public TQObject { public: - SQ_IconLoader(TQObject *tqparent = 0); + SQ_IconLoader(TQObject *parent = 0); ~SQ_IconLoader(); TQPixmap loadIcon(const TQString &name, KIcon::Group group = KIcon::Desktop, int size = 16) const; diff --git a/ksquirrel/sq_imageloader.cpp b/ksquirrel/sq_imageloader.cpp index 48b11cd..f818db7 100644 --- a/ksquirrel/sq_imageloader.cpp +++ b/ksquirrel/sq_imageloader.cpp @@ -34,7 +34,7 @@ SQ_ImageLoader * SQ_ImageLoader::m_instance = 0; -SQ_ImageLoader::SQ_ImageLoader(TQObject *tqparent) : TQObject(tqparent), m_errors(0) +SQ_ImageLoader::SQ_ImageLoader(TQObject *parent) : TQObject(parent), m_errors(0) { m_instance = this; diff --git a/ksquirrel/sq_imageloader.h b/ksquirrel/sq_imageloader.h index ecc8c77..409b293 100644 --- a/ksquirrel/sq_imageloader.h +++ b/ksquirrel/sq_imageloader.h @@ -38,7 +38,7 @@ struct SQ_LIBRARY; class SQ_ImageLoader : public TQObject { public: - SQ_ImageLoader(TQObject *tqparent); + SQ_ImageLoader(TQObject *parent); ~SQ_ImageLoader(); /* diff --git a/ksquirrel/sq_kipiinterface.cpp b/ksquirrel/sq_kipiinterface.cpp index b759821..12ec92b 100644 --- a/ksquirrel/sq_kipiinterface.cpp +++ b/ksquirrel/sq_kipiinterface.cpp @@ -111,8 +111,8 @@ class SQ_KIPIImageInfo : public KIPI::ImageInfoShared /***************************************************************/ -SQ_KIPIInterface::SQ_KIPIInterface(TQWidget *tqparent) - : KIPI::Interface(TQT_TQOBJECT(tqparent), "KSquirrel KIPI Interface") +SQ_KIPIInterface::SQ_KIPIInterface(TQWidget *parent) + : KIPI::Interface(TQT_TQOBJECT(parent), "KSquirrel KIPI Interface") { connect(SQ_WidgetStack::instance()->diroperator(), TQT_SIGNAL(fileHighlighted(const KFileItem *)), this, TQT_SLOT(slotSelectionChanged())); diff --git a/ksquirrel/sq_kipiinterface.h b/ksquirrel/sq_kipiinterface.h index f68b1a9..f5d0ee5 100644 --- a/ksquirrel/sq_kipiinterface.h +++ b/ksquirrel/sq_kipiinterface.h @@ -38,7 +38,7 @@ class SQ_KIPIInterface : public KIPI::Interface TQ_OBJECT public: - SQ_KIPIInterface(TQWidget *tqparent); + SQ_KIPIInterface(TQWidget *parent); ~SQ_KIPIInterface(); KIPI::ImageCollection currentAlbum(); diff --git a/ksquirrel/sq_kipimanager.cpp b/ksquirrel/sq_kipimanager.cpp index 3d22675..b049e84 100644 --- a/ksquirrel/sq_kipimanager.cpp +++ b/ksquirrel/sq_kipimanager.cpp @@ -35,12 +35,12 @@ #include "sq_kipiinterface.h" -SQ_ActionMenu::SQ_ActionMenu(const TQString &text, TQObject *tqparent, const char *name) - : KActionMenu(text, tqparent, name) +SQ_ActionMenu::SQ_ActionMenu(const TQString &text, TQObject *parent, const char *name) + : KActionMenu(text, parent, name) {} -SQ_ActionMenu::SQ_ActionMenu(const TQString &text, const TQString &icon, TQObject *tqparent, const char *name) - : KActionMenu(text, icon, tqparent, name) +SQ_ActionMenu::SQ_ActionMenu(const TQString &text, const TQString &icon, TQObject *parent, const char *name) + : KActionMenu(text, icon, parent, name) {} SQ_ActionMenu::~SQ_ActionMenu() @@ -60,7 +60,7 @@ void SQ_ActionMenu::insert(KAction *ka, int index) /***********************************************************************/ -SQ_KIPIManager::SQ_KIPIManager(TQWidget *_parent, const char *name) : TQObject(_parent, name), tqparent(_parent) +SQ_KIPIManager::SQ_KIPIManager(TQWidget *_parent, const char *name) : TQObject(_parent, name), parent(_parent) { kdDebug() << "+SQ_KIPIManager" << endl; @@ -147,7 +147,7 @@ void SQ_KIPIManager::slotReplug() if (!plugin) continue; - plugin->setup(tqparent); + plugin->setup(parent); KActionPtrList actions = plugin->actions(); KActionPtrList::ConstIterator actionIt = actions.begin(), end = actions.end(); diff --git a/ksquirrel/sq_kipimanager.h b/ksquirrel/sq_kipimanager.h index f297e6a..7eeccc9 100644 --- a/ksquirrel/sq_kipimanager.h +++ b/ksquirrel/sq_kipimanager.h @@ -49,8 +49,8 @@ class KPopupMenu; class SQ_ActionMenu : public KActionMenu { public: - SQ_ActionMenu(const TQString &text, TQObject *tqparent = 0, const char *name = 0); - SQ_ActionMenu(const TQString &text, const TQString &icon, TQObject *tqparent = 0, const char *name = 0); + SQ_ActionMenu(const TQString &text, TQObject *parent = 0, const char *name = 0); + SQ_ActionMenu(const TQString &text, const TQString &icon, TQObject *parent = 0, const char *name = 0); /* * remove() all KActions currently plugged. @@ -105,7 +105,7 @@ class SQ_KIPIManager : public TQObject KIPI::PluginLoader *mPluginLoader; CategoryMap cmenus; KAction *noPlugin; - TQWidget *tqparent; + TQWidget *parent; KPopupMenu *p; bool loaded; }; diff --git a/ksquirrel/sq_libraryhandler.cpp b/ksquirrel/sq_libraryhandler.cpp index a264d33..23c84da 100644 --- a/ksquirrel/sq_libraryhandler.cpp +++ b/ksquirrel/sq_libraryhandler.cpp @@ -46,8 +46,8 @@ static const int buffer_size = 10; SQ_LibraryHandler * SQ_LibraryHandler::m_instance = 0; // SQ_LibraryHandler -SQ_LibraryHandler::SQ_LibraryHandler(TQObject *tqparent) - : TQObject(tqparent), TQValueVector<SQ_LIBRARY>() +SQ_LibraryHandler::SQ_LibraryHandler(TQObject *parent) + : TQObject(parent), TQValueVector<SQ_LIBRARY>() { m_instance = this; diff --git a/ksquirrel/sq_libraryhandler.h b/ksquirrel/sq_libraryhandler.h index 05bd4c9..de00e3d 100644 --- a/ksquirrel/sq_libraryhandler.h +++ b/ksquirrel/sq_libraryhandler.h @@ -37,7 +37,7 @@ class KURL; class SQ_LibraryHandler : public TQObject, public TQValueVector<SQ_LIBRARY> { public: - SQ_LibraryHandler(TQObject *tqparent = 0); + SQ_LibraryHandler(TQObject *parent = 0); ~SQ_LibraryHandler(); enum Support { Maybe = 0, Yes, No }; diff --git a/ksquirrel/sq_navigatordropmenu.cpp b/ksquirrel/sq_navigatordropmenu.cpp index c1a09a0..d9cf07e 100644 --- a/ksquirrel/sq_navigatordropmenu.cpp +++ b/ksquirrel/sq_navigatordropmenu.cpp @@ -30,7 +30,7 @@ SQ_NavigatorDropMenu * SQ_NavigatorDropMenu::m_instance= 0; -SQ_NavigatorDropMenu::SQ_NavigatorDropMenu(TQObject *tqparent) : TQObject(tqparent) +SQ_NavigatorDropMenu::SQ_NavigatorDropMenu(TQObject *parent) : TQObject(parent) { m_instance = this; diff --git a/ksquirrel/sq_navigatordropmenu.h b/ksquirrel/sq_navigatordropmenu.h index 9c1910a..d2a1ccf 100644 --- a/ksquirrel/sq_navigatordropmenu.h +++ b/ksquirrel/sq_navigatordropmenu.h @@ -49,7 +49,7 @@ class SQ_NavigatorDropMenu : public TQObject TQ_OBJECT public: - SQ_NavigatorDropMenu(TQObject *tqparent = 0); + SQ_NavigatorDropMenu(TQObject *parent = 0); ~SQ_NavigatorDropMenu(); static SQ_NavigatorDropMenu* instance() { return m_instance; } diff --git a/ksquirrel/sq_pixmapcache.cpp b/ksquirrel/sq_pixmapcache.cpp index ea24851..6710420 100644 --- a/ksquirrel/sq_pixmapcache.cpp +++ b/ksquirrel/sq_pixmapcache.cpp @@ -25,8 +25,8 @@ SQ_PixmapCache * SQ_PixmapCache::m_instance = 0; -SQ_PixmapCache::SQ_PixmapCache(TQObject *tqparent, int limit) - : TQObject(tqparent), TQMap<KURL, SQ_Thumbnail>() +SQ_PixmapCache::SQ_PixmapCache(TQObject *parent, int limit) + : TQObject(parent), TQMap<KURL, SQ_Thumbnail>() { m_instance = this; cache_limit = limit << 10; diff --git a/ksquirrel/sq_pixmapcache.h b/ksquirrel/sq_pixmapcache.h index 6b318b1..3572715 100644 --- a/ksquirrel/sq_pixmapcache.h +++ b/ksquirrel/sq_pixmapcache.h @@ -37,7 +37,7 @@ class SQ_DirThumbs; class SQ_PixmapCache : public TQObject, public TQMap<KURL, SQ_Thumbnail> { public: - SQ_PixmapCache(TQObject *tqparent, int limit = 20*1024); + SQ_PixmapCache(TQObject *parent, int limit = 20*1024); ~SQ_PixmapCache(); /* diff --git a/ksquirrel/sq_popupmenu.cpp b/ksquirrel/sq_popupmenu.cpp index 0dafd91..8bafe01 100644 --- a/ksquirrel/sq_popupmenu.cpp +++ b/ksquirrel/sq_popupmenu.cpp @@ -21,8 +21,8 @@ #include "sq_popupmenu.h" -SQ_PopupMenu::SQ_PopupMenu(TQWidget *tqparent, const char *name) - : KPopupMenu(tqparent, name), title(0) +SQ_PopupMenu::SQ_PopupMenu(TQWidget *parent, const char *name) + : KPopupMenu(parent, name), title(0) {} SQ_PopupMenu::~SQ_PopupMenu() diff --git a/ksquirrel/sq_popupmenu.h b/ksquirrel/sq_popupmenu.h index 0714d64..5df3d88 100644 --- a/ksquirrel/sq_popupmenu.h +++ b/ksquirrel/sq_popupmenu.h @@ -27,7 +27,7 @@ class SQ_PopupMenu : public KPopupMenu { public: - SQ_PopupMenu(TQWidget *tqparent = 0, const char *name = 0); + SQ_PopupMenu(TQWidget *parent = 0, const char *name = 0); ~SQ_PopupMenu(); void insertTitle(const TQString &t); diff --git a/ksquirrel/sq_progress.cpp b/ksquirrel/sq_progress.cpp index 495501f..6e7f0b1 100644 --- a/ksquirrel/sq_progress.cpp +++ b/ksquirrel/sq_progress.cpp @@ -29,8 +29,8 @@ #include "sq_progress.h" -SQ_Progress::SQ_Progress(TQWidget *tqparent, const char *name) - : TQLabel(tqparent, name, TQt::WNoAutoErase), m_text(true), painter(0) +SQ_Progress::SQ_Progress(TQWidget *parent, const char *name) + : TQLabel(parent, name, TQt::WNoAutoErase), m_text(true), painter(0) {} SQ_Progress::~SQ_Progress() diff --git a/ksquirrel/sq_progress.h b/ksquirrel/sq_progress.h index 0c43b56..b6f884a 100644 --- a/ksquirrel/sq_progress.h +++ b/ksquirrel/sq_progress.h @@ -30,7 +30,7 @@ class TQPainter; class SQ_Progress : public TQLabel { public: - SQ_Progress(TQWidget *tqparent = 0, const char *name = 0); + SQ_Progress(TQWidget *parent = 0, const char *name = 0); ~SQ_Progress(); void setTotalSteps(int totalSteps); diff --git a/ksquirrel/sq_progressbox.cpp b/ksquirrel/sq_progressbox.cpp index bd72131..0997470 100644 --- a/ksquirrel/sq_progressbox.cpp +++ b/ksquirrel/sq_progressbox.cpp @@ -24,13 +24,13 @@ #include "sq_iconloader.h" #include "sq_progressbox.h" -SQ_ProgressBox::SQ_ProgressBox(TQWidget *tqparent, const char *name) : TQHBox(tqparent, name) +SQ_ProgressBox::SQ_ProgressBox(TQWidget *parent, const char *name) : TQHBox(parent, name) { // TQToolBar *progressBoxBar = new TQToolBar(TQString(), NULL, this); buttonStop = new TQPushButton(this); buttonStop->setFlat(true); buttonStop->setPixmap(SQ_IconLoader::instance()->loadIcon("player_stop", KIcon::Desktop, KIcon::SizeSmall)); - connect(buttonStop, TQT_SIGNAL(clicked()), tqparent, TQT_SLOT(slotThumbnailUpdateToggle())); + connect(buttonStop, TQT_SIGNAL(clicked()), parent, TQT_SLOT(slotThumbnailUpdateToggle())); // create progress bar p = new SQ_Progress(this); diff --git a/ksquirrel/sq_progressbox.h b/ksquirrel/sq_progressbox.h index f2d501c..35075df 100644 --- a/ksquirrel/sq_progressbox.h +++ b/ksquirrel/sq_progressbox.h @@ -27,7 +27,7 @@ class TQPushButton; class SQ_ProgressBox : public TQHBox { public: - SQ_ProgressBox(TQWidget * tqparent = 0, const char * name = 0); + SQ_ProgressBox(TQWidget * parent = 0, const char * name = 0); ~SQ_ProgressBox(); SQ_Progress* progressBar() const; diff --git a/ksquirrel/sq_selectdeselectgroup.ui b/ksquirrel/sq_selectdeselectgroup.ui index 2395c46..8a1a864 100644 --- a/ksquirrel/sq_selectdeselectgroup.ui +++ b/ksquirrel/sq_selectdeselectgroup.ui @@ -27,7 +27,7 @@ <cstring>textLabel1</cstring> </property> <property name="text"> - <string>Filename or tqmask:</string> + <string>Filename or mask:</string> </property> </widget> <widget class="TQComboBox" row="0" column="1"> @@ -100,7 +100,7 @@ </Q_SLOTS> <functions> <function access="private" specifier="non virtual">init()</function> - <function returnType="int">exec( TQString & tqmask )</function> + <function returnType="int">exec( TQString & mask )</function> </functions> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ksquirrel/sq_selectdeselectgroup.ui.h b/ksquirrel/sq_selectdeselectgroup.ui.h index d7fcb07..eb96298 100644 --- a/ksquirrel/sq_selectdeselectgroup.ui.h +++ b/ksquirrel/sq_selectdeselectgroup.ui.h @@ -31,7 +31,7 @@ void SQ_SelectDeselectGroup::init() #endif } -int SQ_SelectDeselectGroup::exec(TQString &tqmask) +int SQ_SelectDeselectGroup::exec(TQString &mask) { int result = TQDialog::exec(); @@ -47,11 +47,11 @@ int SQ_SelectDeselectGroup::exec(TQString &tqmask) SQ_Config::instance()->setGroup("Fileview"); SQ_Config::instance()->writeEntry("selectdeselecthistory", list); - // save tqmask - tqmask = comboMask->currentText(); + // save mask + mask = comboMask->currentText(); } - return tqmask.isEmpty() ? TQDialog::Rejected : result; + return mask.isEmpty() ? TQDialog::Rejected : result; } void SQ_SelectDeselectGroup::slotEdit() diff --git a/ksquirrel/sq_slideshowwidget.cpp b/ksquirrel/sq_slideshowwidget.cpp index ded1424..5e330aa 100644 --- a/ksquirrel/sq_slideshowwidget.cpp +++ b/ksquirrel/sq_slideshowwidget.cpp @@ -50,8 +50,8 @@ SQ_SlideShowWidget * SQ_SlideShowWidget::m_inst = 0; -SQ_SlideShowWidget::SQ_SlideShowWidget(TQWidget *tqparent, const char *name) - : TQWidget(tqparent,name, TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_StaysOnTop | TQt::WNoAutoErase) +SQ_SlideShowWidget::SQ_SlideShowWidget(TQWidget *parent, const char *name) + : TQWidget(parent,name, TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_StaysOnTop | TQt::WNoAutoErase) { m_inst = this; diff --git a/ksquirrel/sq_slideshowwidget.h b/ksquirrel/sq_slideshowwidget.h index c6e1b43..72f15c2 100644 --- a/ksquirrel/sq_slideshowwidget.h +++ b/ksquirrel/sq_slideshowwidget.h @@ -41,7 +41,7 @@ class SQ_SlideShowWidget : public TQWidget TQ_OBJECT public: - SQ_SlideShowWidget(TQWidget *tqparent = 0, const char *name = 0); + SQ_SlideShowWidget(TQWidget *parent = 0, const char *name = 0); ~SQ_SlideShowWidget(); void beginSlideShow(int totl); diff --git a/ksquirrel/sq_splashscreen.cpp b/ksquirrel/sq_splashscreen.cpp index fc02b7f..9b9b0b0 100644 --- a/ksquirrel/sq_splashscreen.cpp +++ b/ksquirrel/sq_splashscreen.cpp @@ -48,8 +48,8 @@ SQ_SplashScreen * SQ_SplashScreen::m_inst = 0; -SQ_SplashScreen::SQ_SplashScreen(TQWidget * tqparent, const char *name) - : TQWidget(tqparent, name, +SQ_SplashScreen::SQ_SplashScreen(TQWidget * parent, const char *name) + : TQWidget(parent, name, TQt::WStyle_Customize | TQt::WStyle_NoBorder | TQt::WStyle_StaysOnTop | diff --git a/ksquirrel/sq_splashscreen.h b/ksquirrel/sq_splashscreen.h index 7e198b4..9473c71 100644 --- a/ksquirrel/sq_splashscreen.h +++ b/ksquirrel/sq_splashscreen.h @@ -44,7 +44,7 @@ class SQ_Progress; class SQ_SplashScreen : public TQWidget { public: - SQ_SplashScreen(TQWidget *tqparent = 0, const char *name = 0); + SQ_SplashScreen(TQWidget *parent = 0, const char *name = 0); ~SQ_SplashScreen(); static void advance(); diff --git a/ksquirrel/sq_thumbnailloadjob.cpp b/ksquirrel/sq_thumbnailloadjob.cpp index 751da4d..883313a 100644 --- a/ksquirrel/sq_thumbnailloadjob.cpp +++ b/ksquirrel/sq_thumbnailloadjob.cpp @@ -58,7 +58,7 @@ #define SQ_PREDOWNLOAD_SIZE 20 SQ_ThumbnailLoadJob::SQ_ThumbnailLoadJob(const KFileItemList &items, SQ_FileThumbView *parnt) - : KIO::Job(false), tqparent(parnt) + : KIO::Job(false), parent(parnt) { mBrokenThumbnail.thumbnail = KGlobal::iconLoader()->loadIcon("file_broken", KIcon::Desktop, SQ_ThumbnailSize::smallest()); mItems = items; @@ -177,7 +177,7 @@ void SQ_ThumbnailLoadJob::determineNextIcon() SQ_WidgetStack::instance()->thumbnailProcess(); - tfi = reinterpret_cast<SQ_FileThumbViewItem *>(item->extraData(tqparent)); + tfi = reinterpret_cast<SQ_FileThumbViewItem *>(item->extraData(parent)); // 1) local urls that are 100% supported, or // 2) remote urls that are 100% supported or _maybe_ supported (application/octet-stream) diff --git a/ksquirrel/sq_thumbnailloadjob.h b/ksquirrel/sq_thumbnailloadjob.h index e256cbd..fa76b69 100644 --- a/ksquirrel/sq_thumbnailloadjob.h +++ b/ksquirrel/sq_thumbnailloadjob.h @@ -96,7 +96,7 @@ class SQ_ThumbnailLoadJob : public KIO::Job SQ_DirThumbs *dir; SQ_Thumbnail mBrokenThumbnail; - SQ_FileThumbView *tqparent; + SQ_FileThumbView *parent; }; #endif diff --git a/ksquirrel/sq_thumbnailsize.cpp b/ksquirrel/sq_thumbnailsize.cpp index 2f9be60..ff15fcd 100644 --- a/ksquirrel/sq_thumbnailsize.cpp +++ b/ksquirrel/sq_thumbnailsize.cpp @@ -31,14 +31,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. SQ_ThumbnailSize * SQ_ThumbnailSize::m_instance = 0; -SQ_ThumbnailSize::SQ_ThumbnailSize(TQObject *tqparent, Size value) - : TQObject(tqparent), mValue(value), m_extended(false), m_margin(16) +SQ_ThumbnailSize::SQ_ThumbnailSize(TQObject *parent, Size value) + : TQObject(parent), mValue(value), m_extended(false), m_margin(16) { m_instance = this; } -SQ_ThumbnailSize::SQ_ThumbnailSize(TQObject *tqparent, const TQString& str) - : TQObject(tqparent), m_extended(false), m_margin(16) +SQ_ThumbnailSize::SQ_ThumbnailSize(TQObject *parent, const TQString& str) + : TQObject(parent), m_extended(false), m_margin(16) { TQString low = str.lower(); diff --git a/ksquirrel/sq_thumbnailsize.h b/ksquirrel/sq_thumbnailsize.h index d68bb47..587ae39 100644 --- a/ksquirrel/sq_thumbnailsize.h +++ b/ksquirrel/sq_thumbnailsize.h @@ -38,8 +38,8 @@ class SQ_ThumbnailSize : public TQObject public: enum Size { Medium, Large, Huge }; - SQ_ThumbnailSize(TQObject *tqparent, Size value); - SQ_ThumbnailSize(TQObject *tqparent, const TQString& str); + SQ_ThumbnailSize(TQObject *parent, Size value); + SQ_ThumbnailSize(TQObject *parent, const TQString& str); void setExtended(bool); bool extended() const; diff --git a/ksquirrel/sq_thumbnailsunused.cpp b/ksquirrel/sq_thumbnailsunused.cpp index 3861bc4..6b80356 100644 --- a/ksquirrel/sq_thumbnailsunused.cpp +++ b/ksquirrel/sq_thumbnailsunused.cpp @@ -21,7 +21,7 @@ SQ_ThumbnailsUnused * SQ_ThumbnailsUnused::m_instance = 0; -SQ_ThumbnailsUnused::SQ_ThumbnailsUnused(TQObject *tqparent) : TQObject(tqparent), TQMap<KURL, time_t>() +SQ_ThumbnailsUnused::SQ_ThumbnailsUnused(TQObject *parent) : TQObject(parent), TQMap<KURL, time_t>() { m_instance = this; diff --git a/ksquirrel/sq_thumbnailsunused.h b/ksquirrel/sq_thumbnailsunused.h index a201220..94cca16 100644 --- a/ksquirrel/sq_thumbnailsunused.h +++ b/ksquirrel/sq_thumbnailsunused.h @@ -37,7 +37,7 @@ class KConfig; class SQ_ThumbnailsUnused : public TQObject, public TQMap<KURL, time_t> { public: - SQ_ThumbnailsUnused(TQObject *tqparent = 0); + SQ_ThumbnailsUnused(TQObject *parent = 0); ~SQ_ThumbnailsUnused(); bool needUpdate(const KURL &u, time_t t); diff --git a/ksquirrel/sq_widgetstack.cpp b/ksquirrel/sq_widgetstack.cpp index 6394a93..ab2ac43 100644 --- a/ksquirrel/sq_widgetstack.cpp +++ b/ksquirrel/sq_widgetstack.cpp @@ -60,7 +60,7 @@ SQ_WidgetStack * SQ_WidgetStack::m_instance = 0; -SQ_WidgetStack::SQ_WidgetStack(TQWidget *tqparent, const int id) : TQObject(tqparent) +SQ_WidgetStack::SQ_WidgetStack(TQWidget *parent, const int id) : TQObject(parent) { m_instance = this; @@ -85,7 +85,7 @@ SQ_WidgetStack::SQ_WidgetStack(TQWidget *tqparent, const int id) : TQObject(tqpa else // path from command line url = SQ_HLOptions::instance()->dir; - dirop = new SQ_DirOperator(url, static_cast<SQ_DirOperator::ViewT>(id), tqparent); + dirop = new SQ_DirOperator(url, static_cast<SQ_DirOperator::ViewT>(id), parent); raiseWidget(m_type, false); @@ -684,7 +684,7 @@ void SQ_WidgetStack::slotDeselectGroup() */ void SQ_WidgetStack::selectDeselectGroup(bool select) { - TQString tqmask; + TQString mask; KFileView *local = dirop->view(); @@ -693,14 +693,14 @@ void SQ_WidgetStack::selectDeselectGroup(bool select) sd.setCaption(select ? i18n("Select a group of files") : i18n("Deselect a group of files")); sd.pushMask->setText(select ? i18n("Select !") : i18n("Deselect !")); - if(sd.exec(tqmask) == TQDialog::Accepted) + if(sd.exec(mask) == TQDialog::Accepted) { if(select) local->clearSelection(); KFileItemList *sd_files = const_cast<KFileItemList *>(items()); KFileItem *i; - TQRegExp exp(tqmask); + TQRegExp exp(mask); exp.setWildcard(true); if(!sd_files) diff --git a/ksquirrel/sq_widgetstack.h b/ksquirrel/sq_widgetstack.h index 65d910f..fa51255 100644 --- a/ksquirrel/sq_widgetstack.h +++ b/ksquirrel/sq_widgetstack.h @@ -55,7 +55,7 @@ class SQ_WidgetStack : public TQObject * 2 = Detail view * 3 = Thumbnail view */ - SQ_WidgetStack(TQWidget *tqparent, const int id); + SQ_WidgetStack(TQWidget *parent, const int id); ~SQ_WidgetStack(); |