rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kchmviewer@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent 8cbd3f4122
commit 16e768c7ec

@ -84,7 +84,7 @@ inline u_int64_t sr_int(unsigned char* byte, int* bit,
unsigned char s, unsigned char r, size_t& length) unsigned char s, unsigned char r, size_t& length)
{ {
u_int64_t ret; u_int64_t ret;
unsigned char tqmask; unsigned char mask;
int n, n_bits, num_bits, base, count; int n, n_bits, num_bits, base, count;
length = 0; length = 0;
size_t fflen; size_t fflen;
@ -105,37 +105,37 @@ inline u_int64_t sr_int(unsigned char* byte, int* bit,
switch(num_bits){ switch(num_bits){
case 0: case 0:
tqmask = 1; mask = 1;
break; break;
case 1: case 1:
tqmask = 3; mask = 3;
break; break;
case 2: case 2:
tqmask = 7; mask = 7;
break; break;
case 3: case 3:
tqmask = 0xf; mask = 0xf;
break; break;
case 4: case 4:
tqmask = 0x1f; mask = 0x1f;
break; break;
case 5: case 5:
tqmask = 0x3f; mask = 0x3f;
break; break;
case 6: case 6:
tqmask = 0x7f; mask = 0x7f;
break; break;
case 7: case 7:
tqmask = 0xff; mask = 0xff;
break; break;
default: default:
tqmask = 0xff; mask = 0xff;
break; break;
} }
tqmask <<= base; mask <<= base;
ret = (ret << (num_bits+1)) | ret = (ret << (num_bits+1)) |
(u_int64_t)((*byte & tqmask) >> base); (u_int64_t)((*byte & mask) >> base);
if( n > *bit ){ if( n > *bit ){
++byte; ++byte;

@ -27,8 +27,8 @@
#include "kchmbookmarkwindow.moc" #include "kchmbookmarkwindow.moc"
KCHMBookmarkWindow::KCHMBookmarkWindow(TQWidget *tqparent, const char *name) KCHMBookmarkWindow::KCHMBookmarkWindow(TQWidget *parent, const char *name)
: TQWidget(tqparent, name) : TQWidget(parent, name)
{ {
TQVBoxLayout * tqlayout = new TQVBoxLayout (this); TQVBoxLayout * tqlayout = new TQVBoxLayout (this);
tqlayout->setMargin (5); tqlayout->setMargin (5);
@ -192,11 +192,11 @@ void KCHMBookmarkWindow::tqinvalidate( )
m_bookmarkList->clear(); m_bookmarkList->clear();
} }
void KCHMBookmarkWindow::createMenu( KCHMMainWindow * tqparent ) void KCHMBookmarkWindow::createMenu( KCHMMainWindow * parent )
{ {
// Create the main Bookmark menu // Create the main Bookmark menu
m_menuBookmarks = new KTQPopupMenu( tqparent ); m_menuBookmarks = new KTQPopupMenu( parent );
tqparent->menuBar()->insertItem( i18n( "&Bookmarks"), m_menuBookmarks ); parent->menuBar()->insertItem( i18n( "&Bookmarks"), m_menuBookmarks );
m_menuBookmarks->insertItem( i18n( "&Add bookmark"), this, TQT_SLOT(onAddBookmarkPressed()), CTRL+Key_B ); m_menuBookmarks->insertItem( i18n( "&Add bookmark"), this, TQT_SLOT(onAddBookmarkPressed()), CTRL+Key_B );
m_menuBookmarks->insertSeparator(); m_menuBookmarks->insertSeparator();

@ -34,10 +34,10 @@ class KCHMBookmarkWindow : public TQWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KCHMBookmarkWindow(TQWidget *tqparent = 0, const char *name = 0); KCHMBookmarkWindow(TQWidget *parent = 0, const char *name = 0);
virtual ~KCHMBookmarkWindow() {}; virtual ~KCHMBookmarkWindow() {};
void createMenu( KCHMMainWindow * tqparent ); void createMenu( KCHMMainWindow * parent );
void restoreSettings (const KCHMSettings::bookmark_saved_settings_t& settings); void restoreSettings (const KCHMSettings::bookmark_saved_settings_t& settings);
void saveSettings (KCHMSettings::bookmark_saved_settings_t& settings); void saveSettings (KCHMSettings::bookmark_saved_settings_t& settings);

@ -30,8 +30,8 @@
#include "kchmcontentswindow.moc" #include "kchmcontentswindow.moc"
KCHMContentsWindow::KCHMContentsWindow(TQWidget *tqparent, const char *name) KCHMContentsWindow::KCHMContentsWindow(TQWidget *parent, const char *name)
: KQListView(tqparent, name) : KQListView(parent, name)
{ {
m_contextMenu = 0; m_contextMenu = 0;

@ -33,7 +33,7 @@ class KCHMContentsWindow : public KQListView
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KCHMContentsWindow( TQWidget *tqparent = 0, const char *name = 0 ); KCHMContentsWindow( TQWidget *parent = 0, const char *name = 0 );
~KCHMContentsWindow(); ~KCHMContentsWindow();
TQRect tip( const TQPoint & p ); TQRect tip( const TQPoint & p );

@ -24,8 +24,8 @@
#include "kchmdialogchooseurlfromlist.h" #include "kchmdialogchooseurlfromlist.h"
#include "kchmtreeviewitem.h" #include "kchmtreeviewitem.h"
KCHMDialogChooseUrlFromList::KCHMDialogChooseUrlFromList(const TQStringList& urls, const TQStringList& titles, TQWidget* tqparent) KCHMDialogChooseUrlFromList::KCHMDialogChooseUrlFromList(const TQStringList& urls, const TQStringList& titles, TQWidget* parent)
: TQDialog(tqparent, 0, true) : TQDialog(parent, 0, true)
{ {
TQVBoxLayout * tqlayout = new TQVBoxLayout (this); TQVBoxLayout * tqlayout = new TQVBoxLayout (this);
tqlayout->setMargin (5); tqlayout->setMargin (5);

@ -33,7 +33,7 @@ class KCHMDialogChooseUrlFromList : public TQDialog
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KCHMDialogChooseUrlFromList (const TQStringList& urls, const TQStringList& titles, TQWidget* tqparent); KCHMDialogChooseUrlFromList (const TQStringList& urls, const TQStringList& titles, TQWidget* parent);
TQString getSelectedItemUrl() { return m_acceptedurl; } TQString getSelectedItemUrl() { return m_acceptedurl; }
private slots: private slots:

@ -31,8 +31,8 @@
#include "kchmindexwindow.moc" #include "kchmindexwindow.moc"
KCHMIndexWindow::KCHMIndexWindow ( TQWidget * tqparent, const char * name, WFlags f ) KCHMIndexWindow::KCHMIndexWindow ( TQWidget * parent, const char * name, WFlags f )
: TQWidget (tqparent, name, f) : TQWidget (parent, name, f)
{ {
TQVBoxLayout * tqlayout = new TQVBoxLayout (this); TQVBoxLayout * tqlayout = new TQVBoxLayout (this);
tqlayout->setMargin (5); tqlayout->setMargin (5);

@ -35,7 +35,7 @@ class KCHMIndexWindow : public TQWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: 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 tqinvalidate();
void search( const TQString& index ); void search( const TQString& index );

@ -31,8 +31,8 @@
class KCHMListItemTooltip : public TQToolTip class KCHMListItemTooltip : public TQToolTip
{ {
public: public:
KCHMListItemTooltip( KQListView *tqparent ) KCHMListItemTooltip( KQListView *parent )
: TQToolTip( tqparent->viewport() ) { m_pParent = tqparent; } : TQToolTip( parent->viewport() ) { m_pParent = parent; }
virtual ~KCHMListItemTooltip() {}; virtual ~KCHMListItemTooltip() {};

@ -840,8 +840,8 @@ void KCHMMainWindow::setupSignals( )
#if defined(HAVE_SIGACTION) #if defined(HAVE_SIGACTION)
struct sigaction sa; struct sigaction sa;
memset ((char *)&sa, 0, sizeof(sa)); memset ((char *)&sa, 0, sizeof(sa));
sigemptyset (&sa.sa_tqmask); sigemptyset (&sa.sa_mask);
sigaddset (&sa.sa_tqmask, SIGCHLD); sigaddset (&sa.sa_mask, SIGCHLD);
#ifdef SA_RESTART #ifdef SA_RESTART
sa.sa_flags = SA_RESTART; sa.sa_flags = SA_RESTART;
@ -1028,10 +1028,10 @@ void KCHMMainWindow::slotLocateInContentWindow( )
if ( treeitem ) if ( treeitem )
{ {
KCHMIndTocItem * itemtqparent = treeitem; KCHMIndTocItem * itemparent = treeitem;
while ( (itemtqparent = (KCHMIndTocItem*) itemtqparent->tqparent()) != 0 ) while ( (itemparent = (KCHMIndTocItem*) itemparent->parent()) != 0 )
itemtqparent->setOpen(true); itemparent->setOpen(true);
m_contentsWindow->setCurrentItem (treeitem); m_contentsWindow->setCurrentItem (treeitem);
m_contentsWindow->ensureItemVisible (treeitem); m_contentsWindow->ensureItemVisible (treeitem);
@ -1167,9 +1167,9 @@ void KCHMMainWindow::locateInContentTree( const TQString & url )
if ( treeitem ) if ( treeitem )
{ {
KCHMIndTocItem * itemtqparent = treeitem; KCHMIndTocItem * itemparent = treeitem;
while ( (itemtqparent = (KCHMIndTocItem*) itemtqparent->tqparent()) != 0 ) while ( (itemparent = (KCHMIndTocItem*) itemparent->parent()) != 0 )
itemtqparent->setOpen(true); itemparent->setOpen(true);
m_contentsWindow->setCurrentItem (treeitem); m_contentsWindow->setCurrentItem (treeitem);
m_contentsWindow->ensureItemVisible (treeitem); m_contentsWindow->ensureItemVisible (treeitem);

@ -26,8 +26,8 @@
#include "iconstorage.h" #include "iconstorage.h"
KCHMNavToolbar::KCHMNavToolbar( KCHMMainWindow *tqparent ) KCHMNavToolbar::KCHMNavToolbar( KCHMMainWindow *parent )
: TQToolBar( tqparent ) : TQToolBar( parent )
{ {
// Initialize toolbar // Initialize toolbar
setLabel( i18n( "Navigation") ); setLabel( i18n( "Navigation") );
@ -36,7 +36,7 @@ KCHMNavToolbar::KCHMNavToolbar( KCHMMainWindow *tqparent )
m_toolbarIconBackward = new TQToolButton (iconBackward, m_toolbarIconBackward = new TQToolButton (iconBackward,
i18n( "Move backward in history"), i18n( "Move backward in history"),
TQString(), TQString(),
tqparent, parent,
TQT_SLOT( slotNavigateBack() ), TQT_SLOT( slotNavigateBack() ),
this); this);
TQWhatsThis::add( m_toolbarIconBackward, i18n( "Click this button to move backward in browser history") ); 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, m_toolbarIconForward = new TQToolButton (iconForward,
i18n( "Move forward in history"), i18n( "Move forward in history"),
TQString(), TQString(),
tqparent, parent,
TQT_SLOT( slotNavigateForward() ), TQT_SLOT( slotNavigateForward() ),
this); this);
TQWhatsThis::add( m_toolbarIconForward, i18n( "Click this button to move forward in browser history") ); 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, TQToolButton * hb = new TQToolButton (iconHome,
i18n( "Go to the home page"), i18n( "Go to the home page"),
TQString(), TQString(),
tqparent, parent,
TQT_SLOT( slotNavigateHome() ), TQT_SLOT( slotNavigateHome() ),
this); this);
TQWhatsThis::add( hb, i18n( "Click this button to move to the home page") ); TQWhatsThis::add( hb, i18n( "Click this button to move to the home page") );

@ -29,7 +29,7 @@ class KCHMNavToolbar : public TQToolBar
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KCHMNavToolbar( KCHMMainWindow *tqparent ); KCHMNavToolbar( KCHMMainWindow *parent );
~KCHMNavToolbar(); ~KCHMNavToolbar();
public slots: public slots:

@ -43,8 +43,8 @@
static KTQPopupMenu *menu_langlist, *menu_enclist; static KTQPopupMenu *menu_langlist, *menu_enclist;
KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * tqparent ) KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
: TQToolBar (tqparent) : TQToolBar (parent)
{ {
// Toolbar label // Toolbar label
setLabel( i18n( "Find in page") ); 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.") ); 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 // Create the approptiate menu entries in 'View' main menu
m_MenuView = new KTQPopupMenu( tqparent ); m_MenuView = new KTQPopupMenu( parent );
tqparent->menuBar()->insertItem( i18n( "&View"), m_MenuView ); parent->menuBar()->insertItem( i18n( "&View"), m_MenuView );
m_MenuView->insertItem( i18n( "&Increase font"), this, TQT_SLOT(onBtnFontInc()), CTRL+Key_Plus ); 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 ); m_MenuView->insertItem( i18n( "&Decrease font"), this, TQT_SLOT(onBtnFontDec()), CTRL+Key_Minus );
@ -172,7 +172,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * tqparent )
m_MenuView->insertSeparator(); m_MenuView->insertSeparator();
// Create the language selection menu. // Create the language selection menu.
menu_langlist = new KTQPopupMenu( tqparent ); menu_langlist = new KTQPopupMenu( parent );
KTQPopupMenu * menu_sublang = 0; KTQPopupMenu * menu_sublang = 0;
// Because the encoding menu is very large, it is not reasonable to have a slot for every item. // 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 // Special menu for very smart people just to select codepage
TQMap<TQString,bool> addedCharsets; 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) )); connect (menu_enclist, TQT_SIGNAL( activated(int) ), this, TQT_SLOT ( onMenuActivated(int) ));

@ -36,7 +36,7 @@ class KCHMSearchAndViewToolbar : public TQToolBar
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KCHMSearchAndViewToolbar (KCHMMainWindow *tqparent); KCHMSearchAndViewToolbar (KCHMMainWindow *parent);
void setEnabled (bool enable); void setEnabled (bool enable);
void setChosenEncodingInMenu( const LCHMTextEncoding * encoding ); void setChosenEncodingInMenu( const LCHMTextEncoding * encoding );

@ -31,8 +31,8 @@
#include "kchmsearchwindow.moc" #include "kchmsearchwindow.moc"
KCHMSearchWindow::KCHMSearchWindow( TQWidget * tqparent, const char * name, WFlags f ) KCHMSearchWindow::KCHMSearchWindow( TQWidget * parent, const char * name, WFlags f )
: TQWidget (tqparent, name, f) : TQWidget (parent, name, f)
{ {
TQVBoxLayout * tqlayout = new TQVBoxLayout (this); TQVBoxLayout * tqlayout = new TQVBoxLayout (this);
tqlayout->setMargin(6); tqlayout->setMargin(6);

@ -39,8 +39,8 @@ class KCHMClickableLabel : public TQLabel
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KCHMClickableLabel( const TQString& label, TQWidget * tqparent ) KCHMClickableLabel( const TQString& label, TQWidget * parent )
: TQLabel( label, tqparent ) {}; : TQLabel( label, parent ) {};
virtual ~KCHMClickableLabel() {}; virtual ~KCHMClickableLabel() {};
@ -57,7 +57,7 @@ class KCHMSearchWindow : public TQWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: 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 tqinvalidate();
void restoreSettings (const KCHMSettings::search_saved_settings_t& settings); void restoreSettings (const KCHMSettings::search_saved_settings_t& settings);

@ -25,14 +25,14 @@
#include <tqwhatsthis.h> #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'. * name 'name' and widget flags set to 'f'.
* *
* The dialog will by default be modeless, unless you set 'modal' to * The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog. * TRUE to construct a modal dialog.
*/ */
KCHMSetupDialog::KCHMSetupDialog( TQWidget* tqparent, const char* name, bool modal, WFlags fl ) KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal, WFlags fl )
: TQDialog( tqparent, name, modal, fl ) : TQDialog( parent, name, modal, fl )
{ {
if ( !name ) if ( !name )
setName( "MyDialog1" ); setName( "MyDialog1" );

@ -28,11 +28,11 @@
#include "iconstorage.h" #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)
{ {
} }

@ -34,8 +34,8 @@
class KCHMIndTocItem : public TQListViewItem class KCHMIndTocItem : public TQListViewItem
{ {
public: public:
KCHMIndTocItem( TQListViewItem* tqparent, TQListViewItem* after, TQString name, TQString aurl, int image); KCHMIndTocItem( TQListViewItem* parent, TQListViewItem* after, TQString name, TQString aurl, int image);
KCHMIndTocItem( TQListView* tqparent, TQListViewItem* after, TQString name, TQString url, int image); KCHMIndTocItem( TQListView* parent, TQListViewItem* after, TQString name, TQString url, int image);
TQString getUrl() const; TQString getUrl() const;
virtual void setOpen ( bool open ); virtual void setOpen ( bool open );
@ -53,8 +53,8 @@ class KCHMIndTocItem : public TQListViewItem
class KCMSearchTreeViewItem : public TQListViewItem class KCMSearchTreeViewItem : public TQListViewItem
{ {
public: public:
KCMSearchTreeViewItem (TQListView* tqparent, TQString name, TQString loc, TQString url) KCMSearchTreeViewItem (TQListView* parent, TQString name, TQString loc, TQString url)
: TQListViewItem (tqparent, name, loc) : TQListViewItem (parent, name, loc)
{ {
this->url = url; this->url = url;
} }
@ -69,8 +69,8 @@ class KCMSearchTreeViewItem : public TQListViewItem
class KCHMSingleTreeViewItem : public TQListViewItem class KCHMSingleTreeViewItem : public TQListViewItem
{ {
public: public:
KCHMSingleTreeViewItem (TQListView* tqparent, TQString name, TQString url) KCHMSingleTreeViewItem (TQListView* parent, TQString name, TQString url)
: TQListViewItem (tqparent, name) : TQListViewItem (parent, name)
{ {
this->url = url; this->url = url;
} }
@ -85,8 +85,8 @@ class KCHMSingleTreeViewItem : public TQListViewItem
class KCHMBookmarkTreeViewItem : public TQListViewItem class KCHMBookmarkTreeViewItem : public TQListViewItem
{ {
public: public:
KCHMBookmarkTreeViewItem (TQListView* tqparent, TQString n, TQString u, int s) KCHMBookmarkTreeViewItem (TQListView* parent, TQString n, TQString u, int s)
: TQListViewItem (tqparent, n), url(u), name(n), scroll_y(s) { menuid = 0; } : TQListViewItem (parent, n), url(u), name(n), scroll_y(s) { menuid = 0; }
TQString url; TQString url;
TQString name; TQString name;

@ -35,14 +35,14 @@
#include "kchmnavtoolbar.h" #include "kchmnavtoolbar.h"
KCHMViewWindow::KCHMViewWindow( TQTabWidget * tqparent ) KCHMViewWindow::KCHMViewWindow( TQTabWidget * parent )
{ {
tqinvalidate(); tqinvalidate();
m_contextMenu = 0; m_contextMenu = 0;
m_contextMenuLink = 0; m_contextMenuLink = 0;
m_historyMaxSize = 25; m_historyMaxSize = 25;
m_parentTabWidget = tqparent; m_parentTabWidget = parent;
} }
KCHMViewWindow::~KCHMViewWindow() 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 ( "&Copy", ::mainWindow, TQT_SLOT(slotBrowserCopy()) );
contextMenu->insertItem ( "&Select all", ::mainWindow, TQT_SLOT(slotBrowserSelectAll()) ); 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() ) if ( link.isNull() )
{ {
// standard context menu // standard context menu
if ( !m_contextMenu ) if ( !m_contextMenu )
m_contextMenu = createStandardContextMenu( tqparent ); m_contextMenu = createStandardContextMenu( parent );
return m_contextMenu; return m_contextMenu;
} }
@ -168,7 +168,7 @@ KTQPopupMenu * KCHMViewWindow::getContextMenu( const TQString & link, TQWidget *
// standard context menu // standard context menu
if ( !m_contextMenuLink ) if ( !m_contextMenuLink )
{ {
m_contextMenuLink = createStandardContextMenu( tqparent ); m_contextMenuLink = createStandardContextMenu( parent );
m_contextMenuLink->insertSeparator(); m_contextMenuLink->insertSeparator();
m_contextMenuLink->insertItem ( "&Open this link in a new tab", ::mainWindow, TQT_SLOT(slotOpenPageInNewTab()), TQKeySequence("Shift+Enter") ); m_contextMenuLink->insertItem ( "&Open this link in a new tab", ::mainWindow, TQT_SLOT(slotOpenPageInNewTab()), TQKeySequence("Shift+Enter") );

@ -31,7 +31,7 @@
class KCHMViewWindow class KCHMViewWindow
{ {
public: public:
KCHMViewWindow ( TQTabWidget * tqparent ); KCHMViewWindow ( TQTabWidget * parent );
virtual ~KCHMViewWindow(); virtual ~KCHMViewWindow();
//! Open a page from current chm archive //! Open a page from current chm archive
@ -114,8 +114,8 @@ protected:
virtual bool openPage ( const TQString& url ) = 0; virtual bool openPage ( const TQString& url ) = 0;
virtual void handleStartPageAsImage( TQString& link ); virtual void handleStartPageAsImage( TQString& link );
KTQPopupMenu * getContextMenu( const TQString& link, TQWidget * tqparent ); KTQPopupMenu * getContextMenu( const TQString& link, TQWidget * parent );
KTQPopupMenu * createStandardContextMenu( TQWidget * tqparent ); KTQPopupMenu * createStandardContextMenu( TQWidget * parent );
//! History //! History
class KCHMUrlHistory class KCHMUrlHistory

@ -39,8 +39,8 @@
*/ */
#define KEEP_ALL_OPENED_DATA_IN_SOURCE_FACTORY #define KEEP_ALL_OPENED_DATA_IN_SOURCE_FACTORY
KCHMViewWindow_QTextBrowser::KCHMViewWindow_QTextBrowser( TQTabWidget * tqparent ) KCHMViewWindow_QTextBrowser::KCHMViewWindow_QTextBrowser( TQTabWidget * parent )
: TQTextBrowser ( tqparent ), KCHMViewWindow ( tqparent ) : TQTextBrowser ( parent ), KCHMViewWindow ( parent )
{ {
m_zoomfactor = 0; m_zoomfactor = 0;
m_sourcefactory = 0; m_sourcefactory = 0;

@ -35,7 +35,7 @@ class KCHMViewWindow_QTextBrowser : public TQTextBrowser, public KCHMViewWindow
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KCHMViewWindow_QTextBrowser( TQTabWidget * tqparent ); KCHMViewWindow_QTextBrowser( TQTabWidget * parent );
~KCHMViewWindow_QTextBrowser(); ~KCHMViewWindow_QTextBrowser();
//! Open a page from current chm archive //! Open a page from current chm archive

@ -34,8 +34,8 @@
#endif #endif
KCHMViewWindowMgr::KCHMViewWindowMgr( TQWidget *tqparent ) KCHMViewWindowMgr::KCHMViewWindowMgr( TQWidget *parent )
: TQTabWidget( tqparent ) //TQTabWidget : TQTabWidget( parent ) //TQTabWidget
{ {
m_MenuWindow = 0; 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 // Create the approptiate menu entries in 'View' main menu
m_MenuWindow = new KTQPopupMenu( tqparent ); m_MenuWindow = new KTQPopupMenu( parent );
tqparent->menuBar()->insertItem( i18n( "&Window"), m_MenuWindow ); parent->menuBar()->insertItem( i18n( "&Window"), m_MenuWindow );
m_menuIdClose = m_MenuWindow->insertItem( i18n( "&Close"), this, TQT_SLOT( closeCurrentWindow()), CTRL+Key_W ); m_menuIdClose = m_MenuWindow->insertItem( i18n( "&Close"), this, TQT_SLOT( closeCurrentWindow()), CTRL+Key_W );
m_MenuWindow->insertSeparator(); m_MenuWindow->insertSeparator();

@ -33,7 +33,7 @@ class KCHMViewWindowMgr : public TQTabWidget
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KCHMViewWindowMgr( TQWidget *tqparent = 0 ); KCHMViewWindowMgr( TQWidget *parent = 0 );
~KCHMViewWindowMgr( ); ~KCHMViewWindowMgr( );
// Returns a handle to a currently viewed window. // Returns a handle to a currently viewed window.
@ -49,7 +49,7 @@ class KCHMViewWindowMgr : public TQTabWidget
void tqinvalidate(); void tqinvalidate();
// Creates a Window menu // Creates a Window menu
void createMenu( KCHMMainWindow * tqparent ); void createMenu( KCHMMainWindow * parent );
// Saves and restores current settings between sessions // Saves and restores current settings between sessions
void restoreSettings( const KCHMSettings::viewindow_saved_settings_t& settings ); void restoreSettings( const KCHMSettings::viewindow_saved_settings_t& settings );

@ -22,11 +22,11 @@
#include "kde-qt.h" #include "kde-qt.h"
#if defined (USE_KDE) #if defined (USE_KDE)
KQListView::KQListView( TQWidget * tqparent, const char * name, int ) KQListView::KQListView( TQWidget * parent, const char * name, int )
: KListView (tqparent, name) : KListView (parent, name)
#else #else
KQListView::KQListView( TQWidget * tqparent, const char * name, int f ) KQListView::KQListView( TQWidget * parent, const char * name, int f )
: TQListView (tqparent, name, f) : TQListView (parent, name, f)
#endif #endif
{ {
} }

@ -87,15 +87,15 @@
class KQMainWindow : public KTQ_CLASSNAME(MainWindow) class KQMainWindow : public KTQ_CLASSNAME(MainWindow)
{ {
public: public:
KQMainWindow ( TQWidget * tqparent, const char * name, WFlags f ) KQMainWindow ( TQWidget * parent, const char * name, WFlags f )
: KTQ_CLASSNAME(MainWindow) (tqparent, name, f) {}; : KTQ_CLASSNAME(MainWindow) (parent, name, f) {};
}; };
class KQListView : public KTQ_CLASSNAME(ListView) class KQListView : public KTQ_CLASSNAME(ListView)
{ {
public: 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) class KTQTabWidget : public KTQ_CLASSNAME(TabWidget)
{ {
public: public:
KTQTabWidget (TQWidget *tqparent = 0, const char *name = 0, int f = 0) KTQTabWidget (TQWidget *parent = 0, const char *name = 0, int f = 0)
: KTQ_CLASSNAME(TabWidget) (tqparent, name, f) {}; : KTQ_CLASSNAME(TabWidget) (parent, name, f) {};
}; };
class KTQPopupMenu : public KTQ_CLASSNAME(PopupMenu) class KTQPopupMenu : public KTQ_CLASSNAME(PopupMenu)
{ {
public: public:
KTQPopupMenu (TQWidget *tqparent = 0 ) KTQPopupMenu (TQWidget *parent = 0 )
: KTQ_CLASSNAME(PopupMenu) (tqparent) {}; : KTQ_CLASSNAME(PopupMenu) (parent) {};
}; };
#include <tqinputdialog.h> #include <tqinputdialog.h>

@ -26,8 +26,8 @@
#include "kchmsearchwindow.h" #include "kchmsearchwindow.h"
KCHMDCOPIface::KCHMDCOPIface(TQObject *tqparent, const char *name) KCHMDCOPIface::KCHMDCOPIface(TQObject *parent, const char *name)
: TQObject(tqparent, name), DCOPObject( "KCHMDCOPIface" ) : TQObject(parent, name), DCOPObject( "KCHMDCOPIface" )
{ {
} }

@ -34,7 +34,7 @@ class KCHMDCOPIface : public TQObject, public DCOPObject
K_DCOP K_DCOP
public: public:
KCHMDCOPIface( TQObject *tqparent = 0, const char *name = 0 ); KCHMDCOPIface( TQObject *parent = 0, const char *name = 0 );
~KCHMDCOPIface(); ~KCHMDCOPIface();
k_dcop: k_dcop:

@ -37,8 +37,8 @@ TQWidget * KCHMViewWindow_KHTMLPart::getTQWidget()
return view(); return view();
} }
KCHMViewWindow_KHTMLPart::KCHMViewWindow_KHTMLPart( TQTabWidget * tqparent ) KCHMViewWindow_KHTMLPart::KCHMViewWindow_KHTMLPart( TQTabWidget * parent )
: KHTMLPart ( tqparent ), KCHMViewWindow ( tqparent ) : KHTMLPart ( parent ), KCHMViewWindow ( parent )
{ {
m_zoomfactor = 0; m_zoomfactor = 0;
m_currentEncoding = 0; m_currentEncoding = 0;

@ -47,7 +47,7 @@ class KCHMViewWindow_KHTMLPart : public KHTMLPart, public KCHMViewWindow
Q_OBJECT Q_OBJECT
TQ_OBJECT TQ_OBJECT
public: public:
KCHMViewWindow_KHTMLPart( TQTabWidget * tqparent ); KCHMViewWindow_KHTMLPart( TQTabWidget * parent );
~KCHMViewWindow_KHTMLPart(); ~KCHMViewWindow_KHTMLPart();
//! Open a page from current chm archive //! Open a page from current chm archive

@ -39,12 +39,12 @@ static bool run_process( const TQString& command, const TQString& filename )
case 0: // child case 0: // child
if ( fork() != 0 ) 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() ); system( preparedcommand.ascii() );
exit (0); exit (0);
default: // tqparent default: // parent
break; break;
} }

Loading…
Cancel
Save