diff --git a/systemsettings/kcmsearch.cpp b/systemsettings/kcmsearch.cpp index 91f3675..6f36c63 100644 --- a/systemsettings/kcmsearch.cpp +++ b/systemsettings/kcmsearch.cpp @@ -27,8 +27,8 @@ #include "modulesview.h" #include "moduleiconitem.h" -KcmSearch::KcmSearch( TQPtrList *moduleViewList, TQWidget *tqparent, const char *name ) - : KIconViewSearchLine(tqparent, moduleViewList->at(0)->groups[0], name){ +KcmSearch::KcmSearch( TQPtrList *moduleViewList, TQWidget *parent, const char *name ) + : KIconViewSearchLine(parent, moduleViewList->at(0)->groups[0], name){ this->moduleViewList = moduleViewList; } diff --git a/systemsettings/kcmsearch.h b/systemsettings/kcmsearch.h index 49db420..88aa015 100644 --- a/systemsettings/kcmsearch.h +++ b/systemsettings/kcmsearch.h @@ -37,7 +37,7 @@ class KcmSearch : public KIconViewSearchLine TQ_OBJECT public: - KcmSearch( TQPtrList *moduleViewList, TQWidget *tqparent = 0, const char *name = 0 ); + KcmSearch( TQPtrList *moduleViewList, TQWidget *parent = 0, const char *name = 0 ); public slots: /** diff --git a/systemsettings/kcmultiwidget.cpp b/systemsettings/kcmultiwidget.cpp index d7d1bd0..da4484f 100644 --- a/systemsettings/kcmultiwidget.cpp +++ b/systemsettings/kcmultiwidget.cpp @@ -62,18 +62,18 @@ class KCMultiWidget::KCMultiWidgetPrivate }; -KCMultiWidget::KCMultiWidget(TQWidget *tqparent, const char *name, bool modal) +KCMultiWidget::KCMultiWidget(TQWidget *parent, const char *name, bool modal) : KDialogBase(IconList, i18n("Configure"), Help | Default |Cancel | Apply | - Ok | User1 | User2 | User3, Ok, tqparent, name, modal, true, + Ok | User1 | User2 | User3, Ok, parent, name, modal, true, KStdGuiItem::reset(), KStdGuiItem::close(), KStdGuiItem::adminMode()) , dialogface( IconList ), d( new KCMultiWidgetPrivate ) { init(); } -KCMultiWidget::KCMultiWidget( int dialogFace, TQWidget * tqparent, const char * name, bool modal ) +KCMultiWidget::KCMultiWidget( int dialogFace, TQWidget * parent, const char * name, bool modal ) : KDialogBase( dialogFace, "Caption", Help | Default | Cancel | Apply | Ok | - User1 | User2 | User3, Ok, tqparent, name, modal, true, + User1 | User2 | User3, Ok, parent, name, modal, true, KStdGuiItem::reset(), KStdGuiItem::close(), KStdGuiItem::adminMode()) , dialogface( dialogFace ), d( new KCMultiWidgetPrivate ) { @@ -111,7 +111,7 @@ void KCMultiWidget::slotDefault() ModuleList::Iterator end = m_modules.end(); for( ModuleList::Iterator it = m_modules.begin(); it != end; ++it ) - if( pageIndex( ( TQWidget * )( *it ).kcm->tqparent() ) == curPageIndex ) + if( pageIndex( ( TQWidget * )( *it ).kcm->parent() ) == curPageIndex ) { ( *it ).kcm->defaults(); clientChanged( true ); @@ -126,7 +126,7 @@ void KCMultiWidget::slotUser1() ModuleList::Iterator end = m_modules.end(); for( ModuleList::Iterator it = m_modules.begin(); it != end; ++it ) - if( pageIndex( ( TQWidget * )( *it ).kcm->tqparent() ) == curPageIndex ) + if( pageIndex( ( TQWidget * )( *it ).kcm->parent() ) == curPageIndex ) { ( *it ).kcm->load(); clientChanged( false ); @@ -186,7 +186,7 @@ void KCMultiWidget::slotHelp() int curPageIndex = activePageIndex(); ModuleList::Iterator end = m_modules.end(); for( ModuleList::Iterator it = m_modules.begin(); it != end; ++it ) - if( pageIndex( ( TQWidget * )( *it ).kcm->tqparent() ) == curPageIndex ) + if( pageIndex( ( TQWidget * )( *it ).kcm->parent() ) == curPageIndex ) { docPath = ( *it ).kcm->moduleInfo().docPath(); break; diff --git a/systemsettings/kcmultiwidget.h b/systemsettings/kcmultiwidget.h index 181ba4e..ac68c78 100644 --- a/systemsettings/kcmultiwidget.h +++ b/systemsettings/kcmultiwidget.h @@ -46,24 +46,24 @@ public: /** * Constructs a new KCMultiWidget * - * @param tqparent The tqparent widget + * @param parent The parent widget * @param name The widget name * @param modal If you pass true here, the dialog will be modal **/ - KCMultiWidget( TQWidget *tqparent=0, const char *name=0, bool modal=false ); + KCMultiWidget( TQWidget *parent=0, const char *name=0, bool modal=false ); /** * Construct a personalized KCMultiWidget. * * @param dialogFace You can use TreeList, Tabbed, Plain, Swallow or * IconList. - * @param tqparent Parent of the dialog. + * @param parent Parent of the dialog. * @param name Dialog name (for internal use only). * @param modal Controls dialog modality. If @p false, the rest of the * program interface (example: other dialogs) is accessible while * the dialog is open. */ - KCMultiWidget( int dialogFace, TQWidget * tqparent = 0, + KCMultiWidget( int dialogFace, TQWidget * parent = 0, const char * name = 0, bool modal = false ); diff --git a/systemsettings/kcscrollview.cpp b/systemsettings/kcscrollview.cpp index 65f3b5e..a543ac7 100644 --- a/systemsettings/kcscrollview.cpp +++ b/systemsettings/kcscrollview.cpp @@ -20,7 +20,7 @@ #include "kcscrollview.h" -KCScrollView::KCScrollView( TQWidget * tqparent, const char * name, WFlags f) : TQScrollView(tqparent,name,f) { +KCScrollView::KCScrollView( TQWidget * parent, const char * name, WFlags f) : TQScrollView(parent,name,f) { setResizePolicy(AutoOneFit); mainChild = 0; } diff --git a/systemsettings/kcscrollview.h b/systemsettings/kcscrollview.h index 2706353..dc9fbeb 100644 --- a/systemsettings/kcscrollview.h +++ b/systemsettings/kcscrollview.h @@ -24,7 +24,7 @@ class KCScrollView : public TQScrollView { public: - KCScrollView ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); + KCScrollView ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); virtual TQSize tqsizeHint() const; virtual void addChild(TQWidget *child, int x=0, int y=0); diff --git a/systemsettings/mainwindow.cpp b/systemsettings/mainwindow.cpp index aa8106e..0c21736 100644 --- a/systemsettings/mainwindow.cpp +++ b/systemsettings/mainwindow.cpp @@ -52,8 +52,8 @@ #include "kcmultiwidget.h" MainWindow::MainWindow(bool embed, const TQString & menuFile, - TQWidget *tqparent, const char *name) : - KMainWindow(tqparent,name), menu(NULL), embeddedWindows(embed), + TQWidget *parent, const char *name) : + KMainWindow(parent,name), menu(NULL), embeddedWindows(embed), groupWidget(NULL), selectedPage(0), dummyAbout(NULL) { // Load the menu structure in from disk. diff --git a/systemsettings/mainwindow.h b/systemsettings/mainwindow.h index 30f23ad..38b1e0a 100644 --- a/systemsettings/mainwindow.h +++ b/systemsettings/mainwindow.h @@ -48,7 +48,7 @@ class MainWindow : public KMainWindow public: MainWindow(bool embed=true, const TQString &menufile="systemsettings", - TQWidget *tqparent=0, const char *name=0); + TQWidget *parent=0, const char *name=0); ~MainWindow(); private slots: diff --git a/systemsettings/moduleiconitem.cpp b/systemsettings/moduleiconitem.cpp index c03282f..74fedab 100644 --- a/systemsettings/moduleiconitem.cpp +++ b/systemsettings/moduleiconitem.cpp @@ -24,17 +24,17 @@ #define IMAGE_SIZE 32 -ModuleIconItem::ModuleIconItem( KIconView *tqparent, KCModuleInfo module) - : TQIconViewItem( tqparent, module.moduleName(), +ModuleIconItem::ModuleIconItem( KIconView *parent, KCModuleInfo module) + : TQIconViewItem( parent, module.moduleName(), SmallIcon( module.icon(), IMAGE_SIZE ) ), currentState( KIcon::ActiveState), imageName(module.icon()) { modules.append(module); } -ModuleIconItem::ModuleIconItem( KIconView *tqparent, const TQString &text, +ModuleIconItem::ModuleIconItem( KIconView *parent, const TQString &text, const TQString &imageName ) - : TQIconViewItem( tqparent, text, SmallIcon( imageName, IMAGE_SIZE ) ), + : TQIconViewItem( parent, text, SmallIcon( imageName, IMAGE_SIZE ) ), currentState( KIcon::ActiveState ) { this->imageName = imageName; diff --git a/systemsettings/moduleiconitem.h b/systemsettings/moduleiconitem.h index c5ebcb4..f6a69a0 100644 --- a/systemsettings/moduleiconitem.h +++ b/systemsettings/moduleiconitem.h @@ -35,9 +35,9 @@ class ModuleIconItem : public TQIconViewItem { public: - ModuleIconItem( KIconView *tqparent, KCModuleInfo module ); + ModuleIconItem( KIconView *parent, KCModuleInfo module ); - ModuleIconItem( KIconView *tqparent, const TQString &text, + ModuleIconItem( KIconView *parent, const TQString &text, const TQString &imageName ); /** diff --git a/systemsettings/modulesview.cpp b/systemsettings/modulesview.cpp index ceecf4b..ef920f1 100644 --- a/systemsettings/modulesview.cpp +++ b/systemsettings/modulesview.cpp @@ -37,8 +37,8 @@ #include "moduleiconitem.h" #include "kcmodulemenu.h" -ModulesView::ModulesView( KCModuleMenu *rootMenu, const TQString &menuPath, TQWidget *tqparent, - const char *name ) : TQWidget( tqparent, name ), rootMenu( NULL ) +ModulesView::ModulesView( KCModuleMenu *rootMenu, const TQString &menuPath, TQWidget *parent, + const char *name ) : TQWidget( parent, name ), rootMenu( NULL ) { this->rootMenu = rootMenu; this->menuPath = menuPath; diff --git a/systemsettings/modulesview.h b/systemsettings/modulesview.h index 53be985..a334d75 100644 --- a/systemsettings/modulesview.h +++ b/systemsettings/modulesview.h @@ -30,8 +30,8 @@ class RowIconView : public KIconView { public: - RowIconView( TQWidget* tqparent, const char *name=0 ) - : KIconView( tqparent, name ){ }; + RowIconView( TQWidget* parent, const char *name=0 ) + : KIconView( parent, name ){ }; // Figure out the hight/width to have only one row TQSize tqminimumSizeHint() const { @@ -86,7 +86,7 @@ signals: void itemSelected( TQIconViewItem* item ); public: - ModulesView( KCModuleMenu *rootMenu, const TQString &menuPath, TQWidget *tqparent=0, const char *name=0 ); + ModulesView( KCModuleMenu *rootMenu, const TQString &menuPath, TQWidget *parent=0, const char *name=0 ); ~ModulesView(); private: