diff options
Diffstat (limited to 'src')
32 files changed, 96 insertions, 96 deletions
diff --git a/src/kchmbookmarkwindow.cpp b/src/kchmbookmarkwindow.cpp index 75d1ab4..c27e2d1 100644 --- a/src/kchmbookmarkwindow.cpp +++ b/src/kchmbookmarkwindow.cpp @@ -27,8 +27,8 @@ #include "kchmbookmarkwindow.moc" -KCHMBookmarkWindow::KCHMBookmarkWindow(TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +KCHMBookmarkWindow::KCHMBookmarkWindow(TQWidget *parent, const char *name) + : TQWidget(parent, name) { TQVBoxLayout * tqlayout = new TQVBoxLayout (this); tqlayout->setMargin (5); @@ -192,11 +192,11 @@ void KCHMBookmarkWindow::tqinvalidate( ) m_bookmarkList->clear(); } -void KCHMBookmarkWindow::createMenu( KCHMMainWindow * tqparent ) +void KCHMBookmarkWindow::createMenu( KCHMMainWindow * parent ) { // Create the main Bookmark menu - m_menuBookmarks = new KTQPopupMenu( tqparent ); - tqparent->menuBar()->insertItem( i18n( "&Bookmarks"), m_menuBookmarks ); + m_menuBookmarks = new KTQPopupMenu( parent ); + parent->menuBar()->insertItem( i18n( "&Bookmarks"), m_menuBookmarks ); m_menuBookmarks->insertItem( i18n( "&Add bookmark"), this, TQT_SLOT(onAddBookmarkPressed()), CTRL+Key_B ); m_menuBookmarks->insertSeparator(); diff --git a/src/kchmbookmarkwindow.h b/src/kchmbookmarkwindow.h index 1692a3b..98b2f67 100644 --- a/src/kchmbookmarkwindow.h +++ b/src/kchmbookmarkwindow.h @@ -34,10 +34,10 @@ class KCHMBookmarkWindow : public TQWidget Q_OBJECT TQ_OBJECT public: - KCHMBookmarkWindow(TQWidget *tqparent = 0, const char *name = 0); + KCHMBookmarkWindow(TQWidget *parent = 0, const char *name = 0); virtual ~KCHMBookmarkWindow() {}; - void createMenu( KCHMMainWindow * tqparent ); + void createMenu( KCHMMainWindow * parent ); void restoreSettings (const KCHMSettings::bookmark_saved_settings_t& settings); void saveSettings (KCHMSettings::bookmark_saved_settings_t& settings); diff --git a/src/kchmcontentswindow.cpp b/src/kchmcontentswindow.cpp index 5458409..7415df3 100644 --- a/src/kchmcontentswindow.cpp +++ b/src/kchmcontentswindow.cpp @@ -30,8 +30,8 @@ #include "kchmcontentswindow.moc" -KCHMContentsWindow::KCHMContentsWindow(TQWidget *tqparent, const char *name) - : KQListView(tqparent, name) +KCHMContentsWindow::KCHMContentsWindow(TQWidget *parent, const char *name) + : KQListView(parent, name) { m_contextMenu = 0; diff --git a/src/kchmcontentswindow.h b/src/kchmcontentswindow.h index 03ed2d0..d5846e1 100644 --- a/src/kchmcontentswindow.h +++ b/src/kchmcontentswindow.h @@ -33,7 +33,7 @@ class KCHMContentsWindow : public KQListView Q_OBJECT TQ_OBJECT public: - KCHMContentsWindow( TQWidget *tqparent = 0, const char *name = 0 ); + KCHMContentsWindow( TQWidget *parent = 0, const char *name = 0 ); ~KCHMContentsWindow(); TQRect tip( const TQPoint & p ); diff --git a/src/kchmdialogchooseurlfromlist.cpp b/src/kchmdialogchooseurlfromlist.cpp index bd9bde3..57db28e 100644 --- a/src/kchmdialogchooseurlfromlist.cpp +++ b/src/kchmdialogchooseurlfromlist.cpp @@ -24,8 +24,8 @@ #include "kchmdialogchooseurlfromlist.h" #include "kchmtreeviewitem.h" -KCHMDialogChooseUrlFromList::KCHMDialogChooseUrlFromList(const TQStringList& urls, const TQStringList& titles, TQWidget* tqparent) - : TQDialog(tqparent, 0, true) +KCHMDialogChooseUrlFromList::KCHMDialogChooseUrlFromList(const TQStringList& urls, const TQStringList& titles, TQWidget* parent) + : TQDialog(parent, 0, true) { TQVBoxLayout * tqlayout = new TQVBoxLayout (this); tqlayout->setMargin (5); diff --git a/src/kchmdialogchooseurlfromlist.h b/src/kchmdialogchooseurlfromlist.h index 6e24ed0..9390445 100644 --- a/src/kchmdialogchooseurlfromlist.h +++ b/src/kchmdialogchooseurlfromlist.h @@ -33,7 +33,7 @@ class KCHMDialogChooseUrlFromList : public TQDialog Q_OBJECT TQ_OBJECT public: - KCHMDialogChooseUrlFromList (const TQStringList& urls, const TQStringList& titles, TQWidget* tqparent); + KCHMDialogChooseUrlFromList (const TQStringList& urls, const TQStringList& titles, TQWidget* parent); TQString getSelectedItemUrl() { return m_acceptedurl; } private slots: diff --git a/src/kchmindexwindow.cpp b/src/kchmindexwindow.cpp index 04c68cf..01a7a8d 100644 --- a/src/kchmindexwindow.cpp +++ b/src/kchmindexwindow.cpp @@ -31,8 +31,8 @@ #include "kchmindexwindow.moc" -KCHMIndexWindow::KCHMIndexWindow ( TQWidget * tqparent, const char * name, WFlags f ) - : TQWidget (tqparent, name, f) +KCHMIndexWindow::KCHMIndexWindow ( TQWidget * parent, const char * name, WFlags f ) + : TQWidget (parent, name, f) { TQVBoxLayout * tqlayout = new TQVBoxLayout (this); tqlayout->setMargin (5); diff --git a/src/kchmindexwindow.h b/src/kchmindexwindow.h index a8cedbd..5c13bfc 100644 --- a/src/kchmindexwindow.h +++ b/src/kchmindexwindow.h @@ -35,7 +35,7 @@ class KCHMIndexWindow : public TQWidget Q_OBJECT TQ_OBJECT public: - KCHMIndexWindow ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); + KCHMIndexWindow ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); void tqinvalidate(); void search( const TQString& index ); diff --git a/src/kchmlistitemtooltip.h b/src/kchmlistitemtooltip.h index 51c0dd9..46bd2f6 100644 --- a/src/kchmlistitemtooltip.h +++ b/src/kchmlistitemtooltip.h @@ -31,8 +31,8 @@ class KCHMListItemTooltip : public TQToolTip { public: - KCHMListItemTooltip( KQListView *tqparent ) - : TQToolTip( tqparent->viewport() ) { m_pParent = tqparent; } + KCHMListItemTooltip( KQListView *parent ) + : TQToolTip( parent->viewport() ) { m_pParent = parent; } virtual ~KCHMListItemTooltip() {}; diff --git a/src/kchmmainwindow.cpp b/src/kchmmainwindow.cpp index 9246961..7494cf9 100644 --- a/src/kchmmainwindow.cpp +++ b/src/kchmmainwindow.cpp @@ -840,8 +840,8 @@ void KCHMMainWindow::setupSignals( ) #if defined(HAVE_SIGACTION) struct sigaction sa; memset ((char *)&sa, 0, sizeof(sa)); - sigemptyset (&sa.sa_tqmask); - sigaddset (&sa.sa_tqmask, SIGCHLD); + sigemptyset (&sa.sa_mask); + sigaddset (&sa.sa_mask, SIGCHLD); #ifdef SA_RESTART sa.sa_flags = SA_RESTART; @@ -1028,10 +1028,10 @@ void KCHMMainWindow::slotLocateInContentWindow( ) if ( treeitem ) { - KCHMIndTocItem * itemtqparent = treeitem; + KCHMIndTocItem * itemparent = treeitem; - while ( (itemtqparent = (KCHMIndTocItem*) itemtqparent->tqparent()) != 0 ) - itemtqparent->setOpen(true); + while ( (itemparent = (KCHMIndTocItem*) itemparent->parent()) != 0 ) + itemparent->setOpen(true); m_contentsWindow->setCurrentItem (treeitem); m_contentsWindow->ensureItemVisible (treeitem); @@ -1167,9 +1167,9 @@ void KCHMMainWindow::locateInContentTree( const TQString & url ) if ( treeitem ) { - KCHMIndTocItem * itemtqparent = treeitem; - while ( (itemtqparent = (KCHMIndTocItem*) itemtqparent->tqparent()) != 0 ) - itemtqparent->setOpen(true); + KCHMIndTocItem * itemparent = treeitem; + while ( (itemparent = (KCHMIndTocItem*) itemparent->parent()) != 0 ) + itemparent->setOpen(true); m_contentsWindow->setCurrentItem (treeitem); m_contentsWindow->ensureItemVisible (treeitem); diff --git a/src/kchmnavtoolbar.cpp b/src/kchmnavtoolbar.cpp index a7ac446..e0e8790 100644 --- a/src/kchmnavtoolbar.cpp +++ b/src/kchmnavtoolbar.cpp @@ -26,8 +26,8 @@ #include "iconstorage.h" -KCHMNavToolbar::KCHMNavToolbar( KCHMMainWindow *tqparent ) - : TQToolBar( tqparent ) +KCHMNavToolbar::KCHMNavToolbar( KCHMMainWindow *parent ) + : TQToolBar( parent ) { // Initialize toolbar setLabel( i18n( "Navigation") ); @@ -36,7 +36,7 @@ KCHMNavToolbar::KCHMNavToolbar( KCHMMainWindow *tqparent ) m_toolbarIconBackward = new TQToolButton (iconBackward, i18n( "Move backward in history"), TQString(), - tqparent, + parent, TQT_SLOT( slotNavigateBack() ), this); TQWhatsThis::add( m_toolbarIconBackward, i18n( "Click this button to move backward in browser history") ); @@ -45,7 +45,7 @@ KCHMNavToolbar::KCHMNavToolbar( KCHMMainWindow *tqparent ) m_toolbarIconForward = new TQToolButton (iconForward, i18n( "Move forward in history"), TQString(), - tqparent, + parent, TQT_SLOT( slotNavigateForward() ), this); TQWhatsThis::add( m_toolbarIconForward, i18n( "Click this button to move forward in browser history") ); @@ -54,7 +54,7 @@ KCHMNavToolbar::KCHMNavToolbar( KCHMMainWindow *tqparent ) TQToolButton * hb = new TQToolButton (iconHome, i18n( "Go to the home page"), TQString(), - tqparent, + parent, TQT_SLOT( slotNavigateHome() ), this); TQWhatsThis::add( hb, i18n( "Click this button to move to the home page") ); diff --git a/src/kchmnavtoolbar.h b/src/kchmnavtoolbar.h index f8eebe5..734436f 100644 --- a/src/kchmnavtoolbar.h +++ b/src/kchmnavtoolbar.h @@ -29,7 +29,7 @@ class KCHMNavToolbar : public TQToolBar Q_OBJECT TQ_OBJECT public: - KCHMNavToolbar( KCHMMainWindow *tqparent ); + KCHMNavToolbar( KCHMMainWindow *parent ); ~KCHMNavToolbar(); public slots: diff --git a/src/kchmsearchtoolbar.cpp b/src/kchmsearchtoolbar.cpp index 411dba8..a51bb5f 100644 --- a/src/kchmsearchtoolbar.cpp +++ b/src/kchmsearchtoolbar.cpp @@ -43,8 +43,8 @@ static KTQPopupMenu *menu_langlist, *menu_enclist; -KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * tqparent ) - : TQToolBar (tqparent) +KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent ) + : TQToolBar (parent) { // Toolbar label setLabel( i18n( "Find in page") ); @@ -149,8 +149,8 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * tqparent ) TQWhatsThis::add( m_buttonAddBookmark, i18n( "Click this button to go to next page in Table of Content.") ); // Create the approptiate menu entries in 'View' main menu - m_MenuView = new KTQPopupMenu( tqparent ); - tqparent->menuBar()->insertItem( i18n( "&View"), m_MenuView ); + m_MenuView = new KTQPopupMenu( parent ); + parent->menuBar()->insertItem( i18n( "&View"), m_MenuView ); m_MenuView->insertItem( i18n( "&Increase font"), this, TQT_SLOT(onBtnFontInc()), CTRL+Key_Plus ); m_MenuView->insertItem( i18n( "&Decrease font"), this, TQT_SLOT(onBtnFontDec()), CTRL+Key_Minus ); @@ -172,7 +172,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * tqparent ) m_MenuView->insertSeparator(); // Create the language selection menu. - menu_langlist = new KTQPopupMenu( tqparent ); + menu_langlist = new KTQPopupMenu( parent ); KTQPopupMenu * menu_sublang = 0; // Because the encoding menu is very large, it is not reasonable to have a slot for every item. @@ -223,7 +223,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * tqparent ) // Special menu for very smart people just to select codepage TQMap<TQString,bool> addedCharsets; - menu_enclist = new KTQPopupMenu( tqparent ); + menu_enclist = new KTQPopupMenu( parent ); connect (menu_enclist, TQT_SIGNAL( activated(int) ), this, TQT_SLOT ( onMenuActivated(int) )); diff --git a/src/kchmsearchtoolbar.h b/src/kchmsearchtoolbar.h index a60328e..3f6944f 100644 --- a/src/kchmsearchtoolbar.h +++ b/src/kchmsearchtoolbar.h @@ -36,7 +36,7 @@ class KCHMSearchAndViewToolbar : public TQToolBar Q_OBJECT TQ_OBJECT public: - KCHMSearchAndViewToolbar (KCHMMainWindow *tqparent); + KCHMSearchAndViewToolbar (KCHMMainWindow *parent); void setEnabled (bool enable); void setChosenEncodingInMenu( const LCHMTextEncoding * encoding ); diff --git a/src/kchmsearchwindow.cpp b/src/kchmsearchwindow.cpp index 995293d..7e5af5b 100644 --- a/src/kchmsearchwindow.cpp +++ b/src/kchmsearchwindow.cpp @@ -31,8 +31,8 @@ #include "kchmsearchwindow.moc" -KCHMSearchWindow::KCHMSearchWindow( TQWidget * tqparent, const char * name, WFlags f ) - : TQWidget (tqparent, name, f) +KCHMSearchWindow::KCHMSearchWindow( TQWidget * parent, const char * name, WFlags f ) + : TQWidget (parent, name, f) { TQVBoxLayout * tqlayout = new TQVBoxLayout (this); tqlayout->setMargin(6); diff --git a/src/kchmsearchwindow.h b/src/kchmsearchwindow.h index fbbf3f5..165a864 100644 --- a/src/kchmsearchwindow.h +++ b/src/kchmsearchwindow.h @@ -39,8 +39,8 @@ class KCHMClickableLabel : public TQLabel Q_OBJECT TQ_OBJECT public: - KCHMClickableLabel( const TQString& label, TQWidget * tqparent ) - : TQLabel( label, tqparent ) {}; + KCHMClickableLabel( const TQString& label, TQWidget * parent ) + : TQLabel( label, parent ) {}; virtual ~KCHMClickableLabel() {}; @@ -57,7 +57,7 @@ class KCHMSearchWindow : public TQWidget Q_OBJECT TQ_OBJECT public: - KCHMSearchWindow ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); + KCHMSearchWindow ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); void tqinvalidate(); void restoreSettings (const KCHMSettings::search_saved_settings_t& settings); diff --git a/src/kchmsetupdialog.cpp b/src/kchmsetupdialog.cpp index 00e0502..55b643e 100644 --- a/src/kchmsetupdialog.cpp +++ b/src/kchmsetupdialog.cpp @@ -25,14 +25,14 @@ #include <tqwhatsthis.h> /* - * Constructs a KCHMSetupDialog as a child of 'tqparent', with the + * Constructs a KCHMSetupDialog as a child of 'parent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -KCHMSetupDialog::KCHMSetupDialog( TQWidget* tqparent, const char* name, bool modal, WFlags fl ) - : TQDialog( tqparent, name, modal, fl ) +KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal, WFlags fl ) + : TQDialog( parent, name, modal, fl ) { if ( !name ) setName( "MyDialog1" ); diff --git a/src/kchmtreeviewitem.cpp b/src/kchmtreeviewitem.cpp index afa8ff4..11e91e6 100644 --- a/src/kchmtreeviewitem.cpp +++ b/src/kchmtreeviewitem.cpp @@ -28,11 +28,11 @@ #include "iconstorage.h" -KCHMIndTocItem::KCHMIndTocItem( TQListViewItem * tqparent, TQListViewItem * after, TQString name, TQString aurl, int image) : TQListViewItem(tqparent, after, name), url(aurl), image_number(image) +KCHMIndTocItem::KCHMIndTocItem( TQListViewItem * parent, TQListViewItem * after, TQString name, TQString aurl, int image) : TQListViewItem(parent, after, name), url(aurl), image_number(image) { } -KCHMIndTocItem::KCHMIndTocItem( TQListView * tqparent, TQListViewItem * after, TQString name, TQString aurl, int image) : TQListViewItem(tqparent, after, name), url(aurl), image_number(image) +KCHMIndTocItem::KCHMIndTocItem( TQListView * parent, TQListViewItem * after, TQString name, TQString aurl, int image) : TQListViewItem(parent, after, name), url(aurl), image_number(image) { } diff --git a/src/kchmtreeviewitem.h b/src/kchmtreeviewitem.h index cc21870..f5d3413 100644 --- a/src/kchmtreeviewitem.h +++ b/src/kchmtreeviewitem.h @@ -34,8 +34,8 @@ class KCHMIndTocItem : public TQListViewItem { public: - KCHMIndTocItem( TQListViewItem* tqparent, TQListViewItem* after, TQString name, TQString aurl, int image); - KCHMIndTocItem( TQListView* tqparent, TQListViewItem* after, TQString name, TQString url, int image); + KCHMIndTocItem( TQListViewItem* parent, TQListViewItem* after, TQString name, TQString aurl, int image); + KCHMIndTocItem( TQListView* parent, TQListViewItem* after, TQString name, TQString url, int image); TQString getUrl() const; virtual void setOpen ( bool open ); @@ -53,8 +53,8 @@ class KCHMIndTocItem : public TQListViewItem class KCMSearchTreeViewItem : public TQListViewItem { public: - KCMSearchTreeViewItem (TQListView* tqparent, TQString name, TQString loc, TQString url) - : TQListViewItem (tqparent, name, loc) + KCMSearchTreeViewItem (TQListView* parent, TQString name, TQString loc, TQString url) + : TQListViewItem (parent, name, loc) { this->url = url; } @@ -69,8 +69,8 @@ class KCMSearchTreeViewItem : public TQListViewItem class KCHMSingleTreeViewItem : public TQListViewItem { public: - KCHMSingleTreeViewItem (TQListView* tqparent, TQString name, TQString url) - : TQListViewItem (tqparent, name) + KCHMSingleTreeViewItem (TQListView* parent, TQString name, TQString url) + : TQListViewItem (parent, name) { this->url = url; } @@ -85,8 +85,8 @@ class KCHMSingleTreeViewItem : public TQListViewItem class KCHMBookmarkTreeViewItem : public TQListViewItem { public: - KCHMBookmarkTreeViewItem (TQListView* tqparent, TQString n, TQString u, int s) - : TQListViewItem (tqparent, n), url(u), name(n), scroll_y(s) { menuid = 0; } + KCHMBookmarkTreeViewItem (TQListView* parent, TQString n, TQString u, int s) + : TQListViewItem (parent, n), url(u), name(n), scroll_y(s) { menuid = 0; } TQString url; TQString name; diff --git a/src/kchmviewwindow.cpp b/src/kchmviewwindow.cpp index bc758bb..fc77d3e 100644 --- a/src/kchmviewwindow.cpp +++ b/src/kchmviewwindow.cpp @@ -35,14 +35,14 @@ #include "kchmnavtoolbar.h" -KCHMViewWindow::KCHMViewWindow( TQTabWidget * tqparent ) +KCHMViewWindow::KCHMViewWindow( TQTabWidget * parent ) { tqinvalidate(); m_contextMenu = 0; m_contextMenuLink = 0; m_historyMaxSize = 25; - m_parentTabWidget = tqparent; + m_parentTabWidget = parent; } KCHMViewWindow::~KCHMViewWindow() @@ -141,9 +141,9 @@ void KCHMViewWindow::handleStartPageAsImage( TQString & link ) } -KTQPopupMenu * KCHMViewWindow::createStandardContextMenu( TQWidget * tqparent ) +KTQPopupMenu * KCHMViewWindow::createStandardContextMenu( TQWidget * parent ) { - KTQPopupMenu * contextMenu = new KTQPopupMenu( tqparent ); + KTQPopupMenu * contextMenu = new KTQPopupMenu( parent ); contextMenu->insertItem ( "&Copy", ::mainWindow, TQT_SLOT(slotBrowserCopy()) ); contextMenu->insertItem ( "&Select all", ::mainWindow, TQT_SLOT(slotBrowserSelectAll()) ); @@ -152,13 +152,13 @@ KTQPopupMenu * KCHMViewWindow::createStandardContextMenu( TQWidget * tqparent ) } -KTQPopupMenu * KCHMViewWindow::getContextMenu( const TQString & link, TQWidget * tqparent ) +KTQPopupMenu * KCHMViewWindow::getContextMenu( const TQString & link, TQWidget * parent ) { if ( link.isNull() ) { // standard context menu if ( !m_contextMenu ) - m_contextMenu = createStandardContextMenu( tqparent ); + m_contextMenu = createStandardContextMenu( parent ); return m_contextMenu; } @@ -168,7 +168,7 @@ KTQPopupMenu * KCHMViewWindow::getContextMenu( const TQString & link, TQWidget * // standard context menu if ( !m_contextMenuLink ) { - m_contextMenuLink = createStandardContextMenu( tqparent ); + m_contextMenuLink = createStandardContextMenu( parent ); m_contextMenuLink->insertSeparator(); m_contextMenuLink->insertItem ( "&Open this link in a new tab", ::mainWindow, TQT_SLOT(slotOpenPageInNewTab()), TQKeySequence("Shift+Enter") ); diff --git a/src/kchmviewwindow.h b/src/kchmviewwindow.h index cc67db1..6dd59ac 100644 --- a/src/kchmviewwindow.h +++ b/src/kchmviewwindow.h @@ -31,7 +31,7 @@ class KCHMViewWindow { public: - KCHMViewWindow ( TQTabWidget * tqparent ); + KCHMViewWindow ( TQTabWidget * parent ); virtual ~KCHMViewWindow(); //! Open a page from current chm archive @@ -114,8 +114,8 @@ protected: virtual bool openPage ( const TQString& url ) = 0; virtual void handleStartPageAsImage( TQString& link ); - KTQPopupMenu * getContextMenu( const TQString& link, TQWidget * tqparent ); - KTQPopupMenu * createStandardContextMenu( TQWidget * tqparent ); + KTQPopupMenu * getContextMenu( const TQString& link, TQWidget * parent ); + KTQPopupMenu * createStandardContextMenu( TQWidget * parent ); //! History class KCHMUrlHistory diff --git a/src/kchmviewwindow_qtextbrowser.cpp b/src/kchmviewwindow_qtextbrowser.cpp index d519b12..f66dc88 100644 --- a/src/kchmviewwindow_qtextbrowser.cpp +++ b/src/kchmviewwindow_qtextbrowser.cpp @@ -39,8 +39,8 @@ */ #define KEEP_ALL_OPENED_DATA_IN_SOURCE_FACTORY -KCHMViewWindow_QTextBrowser::KCHMViewWindow_QTextBrowser( TQTabWidget * tqparent ) - : TQTextBrowser ( tqparent ), KCHMViewWindow ( tqparent ) +KCHMViewWindow_QTextBrowser::KCHMViewWindow_QTextBrowser( TQTabWidget * parent ) + : TQTextBrowser ( parent ), KCHMViewWindow ( parent ) { m_zoomfactor = 0; m_sourcefactory = 0; diff --git a/src/kchmviewwindow_qtextbrowser.h b/src/kchmviewwindow_qtextbrowser.h index ef9be43..9eb3d3a 100644 --- a/src/kchmviewwindow_qtextbrowser.h +++ b/src/kchmviewwindow_qtextbrowser.h @@ -35,7 +35,7 @@ class KCHMViewWindow_QTextBrowser : public TQTextBrowser, public KCHMViewWindow Q_OBJECT TQ_OBJECT public: - KCHMViewWindow_QTextBrowser( TQTabWidget * tqparent ); + KCHMViewWindow_QTextBrowser( TQTabWidget * parent ); ~KCHMViewWindow_QTextBrowser(); //! Open a page from current chm archive diff --git a/src/kchmviewwindowmgr.cpp b/src/kchmviewwindowmgr.cpp index b65cf7c..4023d7e 100644 --- a/src/kchmviewwindowmgr.cpp +++ b/src/kchmviewwindowmgr.cpp @@ -34,8 +34,8 @@ #endif -KCHMViewWindowMgr::KCHMViewWindowMgr( TQWidget *tqparent ) - : TQTabWidget( tqparent ) //TQTabWidget +KCHMViewWindowMgr::KCHMViewWindowMgr( TQWidget *parent ) + : TQTabWidget( parent ) //TQTabWidget { m_MenuWindow = 0; @@ -58,11 +58,11 @@ KCHMViewWindowMgr::~KCHMViewWindowMgr( ) { } -void KCHMViewWindowMgr::createMenu( KCHMMainWindow * tqparent ) +void KCHMViewWindowMgr::createMenu( KCHMMainWindow * parent ) { // Create the approptiate menu entries in 'View' main menu - m_MenuWindow = new KTQPopupMenu( tqparent ); - tqparent->menuBar()->insertItem( i18n( "&Window"), m_MenuWindow ); + m_MenuWindow = new KTQPopupMenu( parent ); + parent->menuBar()->insertItem( i18n( "&Window"), m_MenuWindow ); m_menuIdClose = m_MenuWindow->insertItem( i18n( "&Close"), this, TQT_SLOT( closeCurrentWindow()), CTRL+Key_W ); m_MenuWindow->insertSeparator(); diff --git a/src/kchmviewwindowmgr.h b/src/kchmviewwindowmgr.h index d3a4931..69a84a4 100644 --- a/src/kchmviewwindowmgr.h +++ b/src/kchmviewwindowmgr.h @@ -33,7 +33,7 @@ class KCHMViewWindowMgr : public TQTabWidget Q_OBJECT TQ_OBJECT public: - KCHMViewWindowMgr( TQWidget *tqparent = 0 ); + KCHMViewWindowMgr( TQWidget *parent = 0 ); ~KCHMViewWindowMgr( ); // Returns a handle to a currently viewed window. @@ -49,7 +49,7 @@ class KCHMViewWindowMgr : public TQTabWidget void tqinvalidate(); // Creates a Window menu - void createMenu( KCHMMainWindow * tqparent ); + void createMenu( KCHMMainWindow * parent ); // Saves and restores current settings between sessions void restoreSettings( const KCHMSettings::viewindow_saved_settings_t& settings ); diff --git a/src/kde-qt.cpp b/src/kde-qt.cpp index 9885b84..71d1b4c 100644 --- a/src/kde-qt.cpp +++ b/src/kde-qt.cpp @@ -22,11 +22,11 @@ #include "kde-qt.h" #if defined (USE_KDE) -KQListView::KQListView( TQWidget * tqparent, const char * name, int ) - : KListView (tqparent, name) +KQListView::KQListView( TQWidget * parent, const char * name, int ) + : KListView (parent, name) #else -KQListView::KQListView( TQWidget * tqparent, const char * name, int f ) - : TQListView (tqparent, name, f) +KQListView::KQListView( TQWidget * parent, const char * name, int f ) + : TQListView (parent, name, f) #endif { } diff --git a/src/kde-qt.h b/src/kde-qt.h index 14cbff5..ac6b5d2 100644 --- a/src/kde-qt.h +++ b/src/kde-qt.h @@ -87,15 +87,15 @@ class KQMainWindow : public KTQ_CLASSNAME(MainWindow) { public: - KQMainWindow ( TQWidget * tqparent, const char * name, WFlags f ) - : KTQ_CLASSNAME(MainWindow) (tqparent, name, f) {}; + KQMainWindow ( TQWidget * parent, const char * name, WFlags f ) + : KTQ_CLASSNAME(MainWindow) (parent, name, f) {}; }; class KQListView : public KTQ_CLASSNAME(ListView) { public: - KQListView(TQWidget *tqparent = 0, const char *name = 0, int f = 0); + KQListView(TQWidget *parent = 0, const char *name = 0, int f = 0); }; @@ -116,15 +116,15 @@ class KTQProgressModalDialog : public KTQ_CLASSNAME(ProgressDialog) class KTQTabWidget : public KTQ_CLASSNAME(TabWidget) { public: - KTQTabWidget (TQWidget *tqparent = 0, const char *name = 0, int f = 0) - : KTQ_CLASSNAME(TabWidget) (tqparent, name, f) {}; + KTQTabWidget (TQWidget *parent = 0, const char *name = 0, int f = 0) + : KTQ_CLASSNAME(TabWidget) (parent, name, f) {}; }; class KTQPopupMenu : public KTQ_CLASSNAME(PopupMenu) { public: - KTQPopupMenu (TQWidget *tqparent = 0 ) - : KTQ_CLASSNAME(PopupMenu) (tqparent) {}; + KTQPopupMenu (TQWidget *parent = 0 ) + : KTQ_CLASSNAME(PopupMenu) (parent) {}; }; #include <tqinputdialog.h> diff --git a/src/kde/kchmdcopiface.cpp b/src/kde/kchmdcopiface.cpp index 2054d69..d6a90da 100644 --- a/src/kde/kchmdcopiface.cpp +++ b/src/kde/kchmdcopiface.cpp @@ -26,8 +26,8 @@ #include "kchmsearchwindow.h" -KCHMDCOPIface::KCHMDCOPIface(TQObject *tqparent, const char *name) - : TQObject(tqparent, name), DCOPObject( "KCHMDCOPIface" ) +KCHMDCOPIface::KCHMDCOPIface(TQObject *parent, const char *name) + : TQObject(parent, name), DCOPObject( "KCHMDCOPIface" ) { } diff --git a/src/kde/kchmdcopiface.h b/src/kde/kchmdcopiface.h index 2c8800f..39872f9 100644 --- a/src/kde/kchmdcopiface.h +++ b/src/kde/kchmdcopiface.h @@ -34,7 +34,7 @@ class KCHMDCOPIface : public TQObject, public DCOPObject K_DCOP public: - KCHMDCOPIface( TQObject *tqparent = 0, const char *name = 0 ); + KCHMDCOPIface( TQObject *parent = 0, const char *name = 0 ); ~KCHMDCOPIface(); k_dcop: diff --git a/src/kde/kchmviewwindow_khtmlpart.cpp b/src/kde/kchmviewwindow_khtmlpart.cpp index e3c8f42..d6cb639 100644 --- a/src/kde/kchmviewwindow_khtmlpart.cpp +++ b/src/kde/kchmviewwindow_khtmlpart.cpp @@ -37,8 +37,8 @@ TQWidget * KCHMViewWindow_KHTMLPart::getTQWidget() return view(); } -KCHMViewWindow_KHTMLPart::KCHMViewWindow_KHTMLPart( TQTabWidget * tqparent ) - : KHTMLPart ( tqparent ), KCHMViewWindow ( tqparent ) +KCHMViewWindow_KHTMLPart::KCHMViewWindow_KHTMLPart( TQTabWidget * parent ) + : KHTMLPart ( parent ), KCHMViewWindow ( parent ) { m_zoomfactor = 0; m_currentEncoding = 0; diff --git a/src/kde/kchmviewwindow_khtmlpart.h b/src/kde/kchmviewwindow_khtmlpart.h index c319a08..178b103 100644 --- a/src/kde/kchmviewwindow_khtmlpart.h +++ b/src/kde/kchmviewwindow_khtmlpart.h @@ -47,7 +47,7 @@ class KCHMViewWindow_KHTMLPart : public KHTMLPart, public KCHMViewWindow Q_OBJECT TQ_OBJECT public: - KCHMViewWindow_KHTMLPart( TQTabWidget * tqparent ); + KCHMViewWindow_KHTMLPart( TQTabWidget * parent ); ~KCHMViewWindow_KHTMLPart(); //! Open a page from current chm archive diff --git a/src/kqrunprocess.h b/src/kqrunprocess.h index 0cd165e..e081c87 100644 --- a/src/kqrunprocess.h +++ b/src/kqrunprocess.h @@ -39,12 +39,12 @@ static bool run_process( const TQString& command, const TQString& filename ) case 0: // child if ( fork() != 0 ) - exit(0); // exit immediately - our child is now has init as his tqparent + exit(0); // exit immediately - our child is now has init as his parent system( preparedcommand.ascii() ); exit (0); - default: // tqparent + default: // parent break; } |