TDE
/
kchmviewer
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kchmviewer
0
0
Fork 0
Code Issues Releases Wiki Activity

Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 13a90d0799)
r14.1.x
Michele Calgaro 10 months ago
parent d2f01bb5cd
commit 5a0966ca1f
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
15 changed files with 110 additions and 110 deletions
Show Stats Download Patch File Download Diff File

24
src/kchmbookmarkwindow.cpp
Unescape View File

@ -50,29 +50,29 @@ KCHMBookmarkWindow::KCHMBookmarkWindow(TQWidget *parent, const char *name)
hlayout->addWidget (del); hlayout->addWidget (del);
connect( m_bookmarkList, connect( m_bookmarkList,
TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int) ), TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int) ),
this, this,
TQT_SLOT( onDoubleClicked ( TQListViewItem *, const TQPoint &, int) ) ); TQ_SLOT( onDoubleClicked ( TQListViewItem *, const TQPoint &, int) ) );
connect( add, connect( add,
TQT_SIGNAL( clicked () ), TQ_SIGNAL( clicked () ),
this, this,
TQT_SLOT( onAddBookmarkPressed( ) ) ); TQ_SLOT( onAddBookmarkPressed( ) ) );
connect( del, connect( del,
TQT_SIGNAL( clicked () ), TQ_SIGNAL( clicked () ),
this, this,
TQT_SLOT( onDelBookmarkPressed( ) ) ); TQ_SLOT( onDelBookmarkPressed( ) ) );
connect( edit, connect( edit,
TQT_SIGNAL( clicked () ), TQ_SIGNAL( clicked () ),
this, this,
TQT_SLOT( onEditBookmarkPressed( ) ) ); TQ_SLOT( onEditBookmarkPressed( ) ) );
connect( m_bookmarkList, connect( m_bookmarkList,
TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ),
this, this,
TQT_SLOT( slotContextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ) ); TQ_SLOT( slotContextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ) );
m_menuBookmarks = 0; m_menuBookmarks = 0;
m_contextMenu = 0; m_contextMenu = 0;
@ -198,10 +198,10 @@ void KCHMBookmarkWindow::createMenu( KCHMMainWindow * parent )
m_menuBookmarks = new KTQPopupMenu( parent ); m_menuBookmarks = new KTQPopupMenu( parent );
parent->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, TQ_SLOT(onAddBookmarkPressed()), CTRL+Key_B );
m_menuBookmarks->insertSeparator(); m_menuBookmarks->insertSeparator();
connect( m_menuBookmarks, TQT_SIGNAL( activated(int) ), this, TQT_SLOT ( onBookmarkSelected(int) )); connect( m_menuBookmarks, TQ_SIGNAL( activated(int) ), this, TQ_SLOT ( onBookmarkSelected(int) ));
} }
void KCHMBookmarkWindow::onBookmarkSelected( int bookmark ) void KCHMBookmarkWindow::onBookmarkSelected( int bookmark )

6
src/kchmcontentswindow.cpp
Unescape View File

@ -42,11 +42,11 @@ KCHMContentsWindow::KCHMContentsWindow(TQWidget *parent, const char *name)
header()->hide(); header()->hide();
setShowToolTips( false ); setShowToolTips( false );
connect( this, TQT_SIGNAL( onItem ( TQListViewItem * ) ), this, TQT_SLOT( slotOnItem( TQListViewItem * ) ) ); connect( this, TQ_SIGNAL( onItem ( TQListViewItem * ) ), this, TQ_SLOT( slotOnItem( TQListViewItem * ) ) );
connect( this, connect( this,
TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ),
this, this,
TQT_SLOT( slotContextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ) ); TQ_SLOT( slotContextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ) );
new KCHMListItemTooltip( this ); new KCHMListItemTooltip( this );

8
src/kchmdialogchooseurlfromlist.cpp
Unescape View File

@ -46,11 +46,11 @@ KCHMDialogChooseUrlFromList::KCHMDialogChooseUrlFromList(const TQStringList& url
hlayout->addWidget (bok); hlayout->addWidget (bok);
hlayout->addWidget (bcancel); hlayout->addWidget (bcancel);
connect( m_urlsList, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int) ), this, TQT_SLOT( onDoubleClicked ( TQListViewItem *, const TQPoint &, int) ) ); connect( m_urlsList, TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int) ), this, TQ_SLOT( onDoubleClicked ( TQListViewItem *, const TQPoint &, int) ) );
connect( m_urlsList, TQT_SIGNAL( currentChanged ( TQListViewItem *) ), this, TQT_SLOT( onCurrentChanged ( TQListViewItem *) ) ); connect( m_urlsList, TQ_SIGNAL( currentChanged ( TQListViewItem *) ), this, TQ_SLOT( onCurrentChanged ( TQListViewItem *) ) );
connect( bok, TQT_SIGNAL( clicked () ), this, TQT_SLOT( accept() ) ); connect( bok, TQ_SIGNAL( clicked () ), this, TQ_SLOT( accept() ) );
connect( bcancel, TQT_SIGNAL( clicked () ), this, TQT_SLOT( reject() ) ); connect( bcancel, TQ_SIGNAL( clicked () ), this, TQ_SLOT( reject() ) );
m_acceptedurl = TQString(); m_acceptedurl = TQString();
} }

16
src/kchmindexwindow.cpp
Unescape View File

@ -52,24 +52,24 @@ KCHMIndexWindow::KCHMIndexWindow ( TQWidget * parent, const char * name, WFlags
layout->addWidget (m_indexList); layout->addWidget (m_indexList);
connect( m_indexFinder, connect( m_indexFinder,
TQT_SIGNAL( textChanged (const TQString &) ), TQ_SIGNAL( textChanged (const TQString &) ),
this, this,
TQT_SLOT( onTextChanged(const TQString &) ) ); TQ_SLOT( onTextChanged(const TQString &) ) );
connect( m_indexFinder, connect( m_indexFinder,
TQT_SIGNAL( returnPressed() ), TQ_SIGNAL( returnPressed() ),
this, this,
TQT_SLOT( onReturnPressed() ) ); TQ_SLOT( onReturnPressed() ) );
connect( m_indexList, connect( m_indexList,
TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int) ), TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int) ),
this, this,
TQT_SLOT( onDoubleClicked ( TQListViewItem *, const TQPoint &, int) ) ); TQ_SLOT( onDoubleClicked ( TQListViewItem *, const TQPoint &, int) ) );
connect( m_indexList, connect( m_indexList,
TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ),
this, this,
TQT_SLOT( slotContextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ) ); TQ_SLOT( slotContextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ) );
m_indexListFilled = false; m_indexListFilled = false;
m_lastSelectedItem = 0; m_lastSelectedItem = 0;

52
src/kchmmainwindow.cpp
Unescape View File

@ -109,12 +109,12 @@ KCHMMainWindow::KCHMMainWindow()
#endif /* defined (ENABLE_AUTOTEST_SUPPORT) */ #endif /* defined (ENABLE_AUTOTEST_SUPPORT) */
TQAccel * accel = new TQAccel( this ); TQAccel * accel = new TQAccel( this );
accel->connectItem ( accel->insertItem ( Key_F11 ), this, TQT_SLOT ( slotToggleFullScreenMode() ) ); accel->connectItem ( accel->insertItem ( Key_F11 ), this, TQ_SLOT ( slotToggleFullScreenMode() ) );
accel->connectItem ( accel->insertItem ( CTRL + Key_1), this, TQT_SLOT ( slotActivateContentTab() ) ); accel->connectItem ( accel->insertItem ( CTRL + Key_1), this, TQ_SLOT ( slotActivateContentTab() ) );
accel->connectItem ( accel->insertItem ( CTRL + Key_2), this, TQT_SLOT ( slotActivateIndexTab() ) ); accel->connectItem ( accel->insertItem ( CTRL + Key_2), this, TQ_SLOT ( slotActivateIndexTab() ) );
accel->connectItem ( accel->insertItem ( CTRL + Key_3), this, TQT_SLOT ( slotActivateSearchTab() ) ); accel->connectItem ( accel->insertItem ( CTRL + Key_3), this, TQ_SLOT ( slotActivateSearchTab() ) );
accel->connectItem ( accel->insertItem ( CTRL + Key_4), this, TQT_SLOT ( slotActivateBookmarkTab() ) ); accel->connectItem ( accel->insertItem ( CTRL + Key_4), this, TQ_SLOT ( slotActivateBookmarkTab() ) );
accel->connectItem ( accel->insertItem ( Key_F3 ), m_searchToolbar, TQT_SLOT ( onBtnNextSearchResult() ) ); accel->connectItem ( accel->insertItem ( Key_F3 ), m_searchToolbar, TQ_SLOT ( onBtnNextSearchResult() ) );
statusBar()->show(); statusBar()->show();
setIcon( *gIconStorage.getApplicationIcon() ); setIcon( *gIconStorage.getApplicationIcon() );
@ -474,7 +474,7 @@ void KCHMMainWindow::setupToolbarsAndMenu( )
i18n( "Open File" ), i18n( "Open File" ),
TQString(), TQString(),
this, this,
TQT_SLOT( slotOpenMenuItemActivated() ), TQ_SLOT( slotOpenMenuItemActivated() ),
toolbar); toolbar);
TQString fileOpenText = i18n( "Click this button to open an existing chm file." ); TQString fileOpenText = i18n( "Click this button to open an existing chm file." );
@ -485,7 +485,7 @@ void KCHMMainWindow::setupToolbarsAndMenu( )
i18n( "Print File" ), i18n( "Print File" ),
TQString(), TQString(),
this, this,
TQT_SLOT( slotPrintMenuItemActivated() ), TQ_SLOT( slotPrintMenuItemActivated() ),
toolbar); toolbar);
TQString filePrintText = i18n( "Click this button to print the current page"); TQString filePrintText = i18n( "Click this button to print the current page");
@ -496,30 +496,30 @@ void KCHMMainWindow::setupToolbarsAndMenu( )
menuBar()->insertItem( i18n( "&File"), file ); menuBar()->insertItem( i18n( "&File"), file );
int id; int id;
id = file->insertItem ( iconFileOpen, i18n( "&Open..."), this, TQT_SLOT( slotOpenMenuItemActivated() ), CTRL+Key_O ); id = file->insertItem ( iconFileOpen, i18n( "&Open..."), this, TQ_SLOT( slotOpenMenuItemActivated() ), CTRL+Key_O );
file->TQMenuData::setWhatsThis( id, fileOpenText ); file->TQMenuData::setWhatsThis( id, fileOpenText );
id = file->insertItem( iconFilePrint, i18n( "&Print..."), this, TQT_SLOT( slotPrintMenuItemActivated() ), CTRL+Key_P ); id = file->insertItem( iconFilePrint, i18n( "&Print..."), this, TQ_SLOT( slotPrintMenuItemActivated() ), CTRL+Key_P );
file->TQMenuData::setWhatsThis( id, filePrintText ); file->TQMenuData::setWhatsThis( id, filePrintText );
file->insertSeparator(); file->insertSeparator();
id = file->insertItem ( i18n( "E&xtract CHM content..."), this, TQT_SLOT( slotExtractCHM() ) ); id = file->insertItem ( i18n( "E&xtract CHM content..."), this, TQ_SLOT( slotExtractCHM() ) );
file->TQMenuData::setWhatsThis( id, i18n( "Click this button to extract the whole CHM file content into a specific directory") ); file->TQMenuData::setWhatsThis( id, i18n( "Click this button to extract the whole CHM file content into a specific directory") );
file->insertSeparator(); file->insertSeparator();
m_menuHistory = new KTQPopupMenu( file ); m_menuHistory = new KTQPopupMenu( file );
connect ( m_menuHistory, TQT_SIGNAL( activated(int) ), this, TQT_SLOT ( slotHistoryMenuItemActivated(int) )); connect ( m_menuHistory, TQ_SIGNAL( activated(int) ), this, TQ_SLOT ( slotHistoryMenuItemActivated(int) ));
file->insertItem( i18n( "&Recent files"), m_menuHistory ); file->insertItem( i18n( "&Recent files"), m_menuHistory );
file->insertSeparator(); file->insertSeparator();
file->insertItem( i18n( "&Quit"), tqApp, TQT_SLOT( closeAllWindows() ), CTRL+Key_Q ); file->insertItem( i18n( "&Quit"), tqApp, TQ_SLOT( closeAllWindows() ), CTRL+Key_Q );
KTQPopupMenu * menu_edit = new KTQPopupMenu( this ); KTQPopupMenu * menu_edit = new KTQPopupMenu( this );
menuBar()->insertItem( i18n( "&Edit"), menu_edit ); menuBar()->insertItem( i18n( "&Edit"), menu_edit );
menu_edit->insertItem ( i18n( "&Copy"), this, TQT_SLOT( slotBrowserCopy()), CTRL+Key_C ); menu_edit->insertItem ( i18n( "&Copy"), this, TQ_SLOT( slotBrowserCopy()), CTRL+Key_C );
menu_edit->insertItem ( i18n( "&Select all"), this, TQT_SLOT( slotBrowserSelectAll()), CTRL+Key_A ); menu_edit->insertItem ( i18n( "&Select all"), this, TQ_SLOT( slotBrowserSelectAll()), CTRL+Key_A );
menu_edit->insertSeparator(); menu_edit->insertSeparator();
@ -537,16 +537,16 @@ void KCHMMainWindow::setupToolbarsAndMenu( )
KTQPopupMenu * settings = new KTQPopupMenu( this ); KTQPopupMenu * settings = new KTQPopupMenu( this );
menuBar()->insertItem( i18n( "&Settings"), settings ); menuBar()->insertItem( i18n( "&Settings"), settings );
settings->insertItem( i18n( "&Change settings..."), this, TQT_SLOT( slotChangeSettingsMenuItemActivated() )); settings->insertItem( i18n( "&Change settings..."), this, TQ_SLOT( slotChangeSettingsMenuItemActivated() ));
#if defined(USE_KDE) #if defined(USE_KDE)
TQPopupMenu *help = helpMenu( m_aboutDlgMenuText ); TQPopupMenu *help = helpMenu( m_aboutDlgMenuText );
#else #else
KTQPopupMenu * help = new KTQPopupMenu( this ); KTQPopupMenu * help = new KTQPopupMenu( this );
help->insertItem( i18n( "&About"), this, TQT_SLOT( slotAboutMenuItemActivated() ), Key_F1 ); help->insertItem( i18n( "&About"), this, TQ_SLOT( slotAboutMenuItemActivated() ), Key_F1 );
help->insertItem( i18n( "About &TQt"), this, TQT_SLOT( slotAboutQtMenuItemActivated() )); help->insertItem( i18n( "About &TQt"), this, TQ_SLOT( slotAboutQtMenuItemActivated() ));
help->insertSeparator(); help->insertSeparator();
help->insertItem( i18n( "What's &This"), this, TQT_SLOT(whatsThis()), SHIFT+Key_F1 ); help->insertItem( i18n( "What's &This"), this, TQ_SLOT(whatsThis()), SHIFT+Key_F1 );
#endif #endif
menuBar()->insertItem( i18n( "&Help"), help ); menuBar()->insertItem( i18n( "&Help"), help );
@ -916,14 +916,14 @@ void KCHMMainWindow::showOrHideContextWindow( int tabindex )
// Handle clicking on m_contentsWindow element // Handle clicking on m_contentsWindow element
connect( m_contentsWindow, connect( m_contentsWindow,
TQT_SIGNAL( clicked( TQListViewItem* ) ), TQ_SIGNAL( clicked( TQListViewItem* ) ),
this, this,
TQT_SLOT( slotOnTreeClicked( TQListViewItem* ) ) ); TQ_SLOT( slotOnTreeClicked( TQListViewItem* ) ) );
connect( m_contentsWindow, connect( m_contentsWindow,
TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ),
this, this,
TQT_SLOT( slotOnTreeDoubleClicked ( TQListViewItem *, const TQPoint &, int ) ) ); TQ_SLOT( slotOnTreeDoubleClicked ( TQListViewItem *, const TQPoint &, int ) ) );
m_tabWidget->insertTab (m_contentsWindow, i18n( "Contents" ), tabindex); m_tabWidget->insertTab (m_contentsWindow, i18n( "Contents" ), tabindex);
} }
@ -1260,7 +1260,7 @@ void KCHMMainWindow::runAutoTest()
else else
m_autoteststate = STATE_OPEN_INDEX; m_autoteststate = STATE_OPEN_INDEX;
TQTimer::singleShot (500, this, TQT_SLOT(runAutoTest()) ); TQTimer::singleShot (500, this, TQ_SLOT(runAutoTest()) );
break; // allow to finish the initialization sequence break; // allow to finish the initialization sequence
case STATE_CONTENTS_OPENNEXTPAGE: case STATE_CONTENTS_OPENNEXTPAGE:
@ -1272,7 +1272,7 @@ void KCHMMainWindow::runAutoTest()
else else
m_autoteststate = STATE_OPEN_INDEX; m_autoteststate = STATE_OPEN_INDEX;
TQTimer::singleShot (50, this, TQT_SLOT(runAutoTest()) ); TQTimer::singleShot (50, this, TQ_SLOT(runAutoTest()) );
break; break;
case STATE_OPEN_INDEX: case STATE_OPEN_INDEX:
@ -1280,7 +1280,7 @@ void KCHMMainWindow::runAutoTest()
m_tabWidget->setCurrentPage (1); m_tabWidget->setCurrentPage (1);
m_autoteststate = STATE_SHUTDOWN; m_autoteststate = STATE_SHUTDOWN;
TQTimer::singleShot (500, this, TQT_SLOT(runAutoTest()) ); TQTimer::singleShot (500, this, TQ_SLOT(runAutoTest()) );
break; break;
case STATE_SHUTDOWN: case STATE_SHUTDOWN:

6
src/kchmnavtoolbar.cpp
Unescape View File

@ -37,7 +37,7 @@ KCHMNavToolbar::KCHMNavToolbar( KCHMMainWindow *parent )
i18n( "Move backward in history"), i18n( "Move backward in history"),
TQString(), TQString(),
parent, parent,
TQT_SLOT( slotNavigateBack() ), TQ_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") );
@ -46,7 +46,7 @@ KCHMNavToolbar::KCHMNavToolbar( KCHMMainWindow *parent )
i18n( "Move forward in history"), i18n( "Move forward in history"),
TQString(), TQString(),
parent, parent,
TQT_SLOT( slotNavigateForward() ), TQ_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") );
@ -55,7 +55,7 @@ KCHMNavToolbar::KCHMNavToolbar( KCHMMainWindow *parent )
i18n( "Go to the home page"), i18n( "Go to the home page"),
TQString(), TQString(),
parent, parent,
TQT_SLOT( slotNavigateHome() ), TQ_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") );
} }

4
src/kchmsearchengine.cpp
Unescape View File

@ -74,9 +74,9 @@ bool KCHMSearchEngine::loadOrGenerateIndex( )
m_Index->setDocListFile( indexfiledoc ); m_Index->setDocListFile( indexfiledoc );
m_progressDlg = new TQProgressDialog( 0 ); m_progressDlg = new TQProgressDialog( 0 );
connect( m_progressDlg, TQT_SIGNAL( canceled() ), this, TQT_SLOT( cancelButtonPressed() ) ); connect( m_progressDlg, TQ_SIGNAL( canceled() ), this, TQ_SLOT( cancelButtonPressed() ) );
connect( m_Index, TQT_SIGNAL( indexingProgress( int ) ), this, TQT_SLOT( setIndexingProgress( int ) ) ); connect( m_Index, TQ_SIGNAL( indexingProgress( int ) ), this, TQ_SLOT( setIndexingProgress( int ) ) );
KCHMShowWaitCursor waitcursor; KCHMShowWaitCursor waitcursor;
TQFile f( indexfiledict ); TQFile f( indexfiledict );

8
src/kchmsearchengine_impl.cpp
Unescape View File

@ -72,8 +72,8 @@ Index::Index( const TQString &dp, const TQString & )
: TQObject( 0, 0 ), dict( 8999 ), docPath( dp ) : TQObject( 0, 0 ), dict( 8999 ), docPath( dp )
{ {
lastWindowClosed = false; lastWindowClosed = false;
connect( tqApp, TQT_SIGNAL( lastWindowClosed() ), connect( tqApp, TQ_SIGNAL( lastWindowClosed() ),
this, TQT_SLOT( setLastWinClosed() ) ); this, TQ_SLOT( setLastWinClosed() ) );
} }
Index::Index( const TQStringList &dl, const TQString & ) Index::Index( const TQStringList &dl, const TQString & )
@ -81,8 +81,8 @@ Index::Index( const TQStringList &dl, const TQString & )
{ {
docList = dl; docList = dl;
lastWindowClosed = false; lastWindowClosed = false;
connect( tqApp, TQT_SIGNAL( lastWindowClosed() ), connect( tqApp, TQ_SIGNAL( lastWindowClosed() ),
this, TQT_SLOT( setLastWinClosed() ) ); this, TQ_SLOT( setLastWinClosed() ) );
} }
void Index::setLastWinClosed() void Index::setLastWinClosed()

42
src/kchmsearchtoolbar.cpp
Unescape View File

@ -63,18 +63,18 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
// Create the combobox to enter the find text // Create the combobox to enter the find text
m_findBox = new TQComboBox (TRUE, this); m_findBox = new TQComboBox (TRUE, this);
m_findBox->setMinimumWidth (200); m_findBox->setMinimumWidth (200);
connect( m_findBox->lineEdit(), TQT_SIGNAL( returnPressed() ), this, TQT_SLOT( onReturnPressed() ) ); connect( m_findBox->lineEdit(), TQ_SIGNAL( returnPressed() ), this, TQ_SLOT( onReturnPressed() ) );
TQWhatsThis::add( m_findBox, i18n( "Enter here the text to search in the current page.") ); TQWhatsThis::add( m_findBox, i18n( "Enter here the text to search in the current page.") );
TQAccel *acc = new TQAccel( this ); TQAccel *acc = new TQAccel( this );
acc->connectItem( acc->insertItem(Key_F+CTRL), this, TQT_SLOT( onAccelFocusSearchField() ) ); acc->connectItem( acc->insertItem(Key_F+CTRL), this, TQ_SLOT( onAccelFocusSearchField() ) );
// Button 'prevous search result' // Button 'prevous search result'
m_buttonPrev = new TQToolButton (iconPrev, m_buttonPrev = new TQToolButton (iconPrev,
i18n( "Previous search result"), i18n( "Previous search result"),
TQString(), TQString(),
this, this,
TQT_SLOT(onBtnPrevSearchResult()), TQ_SLOT(onBtnPrevSearchResult()),
this); this);
TQWhatsThis::add( m_buttonPrev, i18n( "Click this button to find previous search result.") ); TQWhatsThis::add( m_buttonPrev, i18n( "Click this button to find previous search result.") );
@ -83,7 +83,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
i18n( "Next search result"), i18n( "Next search result"),
TQString(), TQString(),
this, this,
TQT_SLOT(onBtnNextSearchResult()), TQ_SLOT(onBtnNextSearchResult()),
this); this);
TQWhatsThis::add( m_buttonNext, i18n( "Click this button to find next search result.") ); TQWhatsThis::add( m_buttonNext, i18n( "Click this button to find next search result.") );
@ -92,7 +92,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
i18n( "Locate this topic in content window"), i18n( "Locate this topic in content window"),
TQString(), TQString(),
this, this,
TQT_SLOT( onBtnLocateInContentWindow() ), TQ_SLOT( onBtnLocateInContentWindow() ),
this ); this );
TQWhatsThis::add( m_buttonLocateInContent, i18n( "Click this button to find current topic in the content window, and open it.") ); TQWhatsThis::add( m_buttonLocateInContent, i18n( "Click this button to find current topic in the content window, and open it.") );
@ -101,7 +101,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
i18n( "Increase font size"), i18n( "Increase font size"),
TQString(), TQString(),
this, this,
TQT_SLOT(onBtnFontInc()), TQ_SLOT(onBtnFontInc()),
this); this);
TQWhatsThis::add( m_buttonFontInc, i18n( "Click this button to increase the font size.") ); TQWhatsThis::add( m_buttonFontInc, i18n( "Click this button to increase the font size.") );
@ -110,7 +110,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
i18n( "Decrease font size"), i18n( "Decrease font size"),
TQString(), TQString(),
this, this,
TQT_SLOT(onBtnFontDec()), TQ_SLOT(onBtnFontDec()),
this); this);
TQWhatsThis::add( m_buttonFontDec, i18n( "Click this button to decrease the font size.") ); TQWhatsThis::add( m_buttonFontDec, i18n( "Click this button to decrease the font size.") );
@ -119,7 +119,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
i18n( "View HTML source"), i18n( "View HTML source"),
TQString(), TQString(),
this, this,
TQT_SLOT(onBtnViewSource()), TQ_SLOT(onBtnViewSource()),
this); this);
TQWhatsThis::add( m_buttonViewSource, i18n( "Click this button to open a separate window with the page HTML source.") ); TQWhatsThis::add( m_buttonViewSource, i18n( "Click this button to open a separate window with the page HTML source.") );
@ -128,7 +128,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
i18n( "Add to bookmarks"), i18n( "Add to bookmarks"),
TQString(), TQString(),
this, this,
TQT_SLOT(onBtnAddBookmark()), TQ_SLOT(onBtnAddBookmark()),
this); this);
TQWhatsThis::add( m_buttonAddBookmark, i18n( "Click this button to add the current page to the bookmarks list.") ); TQWhatsThis::add( m_buttonAddBookmark, i18n( "Click this button to add the current page to the bookmarks list.") );
@ -136,7 +136,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
i18n( "Prev page in TOC"), i18n( "Prev page in TOC"),
TQString(), TQString(),
this, this,
TQT_SLOT(onBtnPrevPageInToc()), TQ_SLOT(onBtnPrevPageInToc()),
this); this);
TQWhatsThis::add( m_buttonAddBookmark, i18n( "Click this button to go to previous page in Table Of Content.") ); TQWhatsThis::add( m_buttonAddBookmark, i18n( "Click this button to go to previous page in Table Of Content.") );
@ -144,7 +144,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
i18n( "Next page in TOC"), i18n( "Next page in TOC"),
TQString(), TQString(),
this, this,
TQT_SLOT(onBtnNextPageInToc()), TQ_SLOT(onBtnNextPageInToc()),
this); this);
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.") );
@ -152,20 +152,20 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
m_MenuView = new KTQPopupMenu( parent ); m_MenuView = new KTQPopupMenu( parent );
parent->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, TQ_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, TQ_SLOT(onBtnFontDec()), CTRL+Key_Minus );
m_MenuView->insertItem( i18n( "&View HTML source"), this, TQT_SLOT(onBtnViewSource()), CTRL+Key_U ); m_MenuView->insertItem( i18n( "&View HTML source"), this, TQ_SLOT(onBtnViewSource()), CTRL+Key_U );
m_MenuView->insertSeparator(); m_MenuView->insertSeparator();
m_MenuView->insertItem( i18n( "&Bookmark this page"), this, TQT_SLOT(onBtnAddBookmark()), CTRL+Key_T ); m_MenuView->insertItem( i18n( "&Bookmark this page"), this, TQ_SLOT(onBtnAddBookmark()), CTRL+Key_T );
m_MenuView->insertSeparator(); m_MenuView->insertSeparator();
m_menuShowFullscreenMenuID = m_MenuView->insertItem( i18n( "&Full screen"), this, m_menuShowFullscreenMenuID = m_MenuView->insertItem( i18n( "&Full screen"), this,
TQT_SLOT(onBtnFullScreen()), Key_F11 ); TQ_SLOT(onBtnFullScreen()), Key_F11 );
m_menuShowContentWindowMenuID = m_MenuView->insertItem( i18n( "&Show contents window"), this, m_menuShowContentWindowMenuID = m_MenuView->insertItem( i18n( "&Show contents window"), this,
TQT_SLOT(onBtnToggleContentWindow()), Key_F9 ); TQ_SLOT(onBtnToggleContentWindow()), Key_F9 );
m_MenuView->insertItem( i18n( "&Locate in contents window"), this, m_MenuView->insertItem( i18n( "&Locate in contents window"), this,
TQT_SLOT(onBtnLocateInContentWindow()), CTRL+Key_L ); TQ_SLOT(onBtnLocateInContentWindow()), CTRL+Key_L );
m_MenuView->setItemChecked( m_menuShowFullscreenMenuID, false ); m_MenuView->setItemChecked( m_menuShowFullscreenMenuID, false );
m_MenuView->setItemChecked( m_menuShowContentWindowMenuID, true ); m_MenuView->setItemChecked( m_menuShowContentWindowMenuID, true );
@ -177,7 +177,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
// 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.
// It is simplier just to use a single slot for any menu item of this submenu. // It is simplier just to use a single slot for any menu item of this submenu.
connect (menu_langlist, TQT_SIGNAL( activated(int) ), this, TQT_SLOT ( onMenuActivated(int) )); connect (menu_langlist, TQ_SIGNAL( activated(int) ), this, TQ_SLOT ( onMenuActivated(int) ));
// Add the language entries // Add the language entries
const LCHMTextEncoding * enctable = LCHMFileImpl::getTextEncodingTable(); const LCHMTextEncoding * enctable = LCHMFileImpl::getTextEncodingTable();
@ -197,7 +197,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
if ( !menu_sublang ) if ( !menu_sublang )
{ {
menu_sublang = new KTQPopupMenu( menu_langlist ); menu_sublang = new KTQPopupMenu( menu_langlist );
connect (menu_sublang, TQT_SIGNAL( activated(int) ), this, TQT_SLOT ( onMenuActivated(int) )); connect (menu_sublang, TQ_SIGNAL( activated(int) ), this, TQ_SLOT ( onMenuActivated(int) ));
} }
menu_sublang->insertItem( item->sublanguage, idx ); menu_sublang->insertItem( item->sublanguage, idx );
@ -225,7 +225,7 @@ KCHMSearchAndViewToolbar::KCHMSearchAndViewToolbar( KCHMMainWindow * parent )
TQMap<TQString,bool> addedCharsets; TQMap<TQString,bool> addedCharsets;
menu_enclist = new KTQPopupMenu( parent ); menu_enclist = new KTQPopupMenu( parent );
connect (menu_enclist, TQT_SIGNAL( activated(int) ), this, TQT_SLOT ( onMenuActivated(int) )); connect (menu_enclist, TQ_SIGNAL( activated(int) ), this, TQ_SLOT ( onMenuActivated(int) ));
// Add the codepage entries // Add the codepage entries
for ( idx = 0; (enctable + idx)->language; idx++ ) for ( idx = 0; (enctable + idx)->language; idx++ )

18
src/kchmsearchwindow.cpp
Unescape View File

@ -44,7 +44,7 @@ KCHMSearchWindow::KCHMSearchWindow( TQWidget * parent, const char * name, WFlags
labellayout->addStretch( 10 ); labellayout->addStretch( 10 );
KCHMClickableLabel * helplink = new KCHMClickableLabel( i18n( "<a href=\"q\"><b>Help</b></a>"), this ); KCHMClickableLabel * helplink = new KCHMClickableLabel( i18n( "<a href=\"q\"><b>Help</b></a>"), this );
connect( helplink, TQT_SIGNAL( clicked() ), this, TQT_SLOT( onHelpClicked() ) ); connect( helplink, TQ_SIGNAL( clicked() ), this, TQ_SLOT( onHelpClicked() ) );
helplink->setCursor( TQCursor( TQt::PointingHandCursor ) ); helplink->setCursor( TQCursor( TQt::PointingHandCursor ) );
labellayout->addWidget ( helplink ); labellayout->addWidget ( helplink );
@ -68,24 +68,24 @@ KCHMSearchWindow::KCHMSearchWindow( TQWidget * parent, const char * name, WFlags
m_searchList->setShowToolTips(true); m_searchList->setShowToolTips(true);
connect( searchButton, connect( searchButton,
TQT_SIGNAL( clicked () ), TQ_SIGNAL( clicked () ),
this, this,
TQT_SLOT( onReturnPressed() ) ); TQ_SLOT( onReturnPressed() ) );
connect( m_searchQuery->lineEdit(), connect( m_searchQuery->lineEdit(),
TQT_SIGNAL( returnPressed() ), TQ_SIGNAL( returnPressed() ),
this, this,
TQT_SLOT( onReturnPressed() ) ); TQ_SLOT( onReturnPressed() ) );
connect( m_searchList, connect( m_searchList,
TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int) ), TQ_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int) ),
this, this,
TQT_SLOT( onDoubleClicked ( TQListViewItem *, const TQPoint &, int) ) ); TQ_SLOT( onDoubleClicked ( TQListViewItem *, const TQPoint &, int) ) );
connect( m_searchList, connect( m_searchList,
TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ), TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint& , int ) ),
this, this,
TQT_SLOT( slotContextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ) ); TQ_SLOT( slotContextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ) );
//layout->addSpacing (10); //layout->addSpacing (10);
layout->addWidget (m_searchList); layout->addWidget (m_searchList);

12
src/kchmviewwindow.cpp
Unescape View File

@ -145,8 +145,8 @@ KTQPopupMenu * KCHMViewWindow::createStandardContextMenu( TQWidget * parent )
{ {
KTQPopupMenu * contextMenu = new KTQPopupMenu( parent ); KTQPopupMenu * contextMenu = new KTQPopupMenu( parent );
contextMenu->insertItem ( "&Copy", ::mainWindow, TQT_SLOT(slotBrowserCopy()) ); contextMenu->insertItem ( "&Copy", ::mainWindow, TQ_SLOT(slotBrowserCopy()) );
contextMenu->insertItem ( "&Select all", ::mainWindow, TQT_SLOT(slotBrowserSelectAll()) ); contextMenu->insertItem ( "&Select all", ::mainWindow, TQ_SLOT(slotBrowserSelectAll()) );
return contextMenu; return contextMenu;
} }
@ -171,9 +171,9 @@ KTQPopupMenu * KCHMViewWindow::getContextMenu( const TQString & link, TQWidget *
m_contextMenuLink = createStandardContextMenu( parent ); 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, TQ_SLOT(slotOpenPageInNewTab()), TQKeySequence("Shift+Enter") );
m_contextMenuLink->insertItem ( "&Open this link in a new background tab", ::mainWindow, TQT_SLOT(slotOpenPageInNewBackgroundTab()), TQKeySequence("Ctrl+Enter") ); m_contextMenuLink->insertItem ( "&Open this link in a new background tab", ::mainWindow, TQ_SLOT(slotOpenPageInNewBackgroundTab()), TQKeySequence("Ctrl+Enter") );
} }
setTabKeeper( link ); setTabKeeper( link );
@ -286,12 +286,12 @@ KTQPopupMenu * KCHMViewWindow::createListItemContextMenu( TQWidget * w )
contextMenu->insertItem ( "&Open this link in a new tab", contextMenu->insertItem ( "&Open this link in a new tab",
::mainWindow, ::mainWindow,
TQT_SLOT( slotOpenPageInNewTab() ), TQ_SLOT( slotOpenPageInNewTab() ),
TQKeySequence( "Shift+Enter" ) ); TQKeySequence( "Shift+Enter" ) );
contextMenu->insertItem ( "&Open this link in a new background tab", contextMenu->insertItem ( "&Open this link in a new background tab",
::mainWindow, ::mainWindow,
TQT_SLOT( slotOpenPageInNewBackgroundTab() ), TQ_SLOT( slotOpenPageInNewBackgroundTab() ),
TQKeySequence( "Ctrl+Enter" ) ); TQKeySequence( "Ctrl+Enter" ) );
return contextMenu; return contextMenu;

2
src/kchmviewwindow_qtextbrowser.cpp
Unescape View File

@ -47,7 +47,7 @@ KCHMViewWindow_QTextBrowser::KCHMViewWindow_QTextBrowser( TQTabWidget * parent )
invalidate(); invalidate();
setTextFormat ( TQt::RichText ); setTextFormat ( TQt::RichText );
connect( this, TQT_SIGNAL( linkClicked (const TQString &) ), this, TQT_SLOT( slotLinkClicked(const TQString &) ) ); connect( this, TQ_SIGNAL( linkClicked (const TQString &) ), this, TQ_SLOT( slotLinkClicked(const TQString &) ) );
} }

12
src/kchmviewwindowmgr.cpp
Unescape View File

@ -40,7 +40,7 @@ KCHMViewWindowMgr::KCHMViewWindowMgr( TQWidget *parent )
m_MenuWindow = 0; m_MenuWindow = 0;
// on current tab changed // on current tab changed
connect( this, TQT_SIGNAL( currentChanged(TQWidget *) ), this, TQT_SLOT( onTabChanged(TQWidget *) ) ); connect( this, TQ_SIGNAL( currentChanged(TQWidget *) ), this, TQ_SLOT( onTabChanged(TQWidget *) ) );
// Create an iconset for the button // Create an iconset for the button
TQIconSet iset( *gIconStorage.getCloseWindowIcon() ); TQIconSet iset( *gIconStorage.getCloseWindowIcon() );
@ -49,7 +49,7 @@ KCHMViewWindowMgr::KCHMViewWindowMgr( TQWidget *parent )
m_closeButton = new TQPushButton( iset, TQString(), this ); m_closeButton = new TQPushButton( iset, TQString(), this );
m_closeButton->setFlat( true ); m_closeButton->setFlat( true );
m_closeButton->setEnabled( false ); m_closeButton->setEnabled( false );
connect( m_closeButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( closeCurrentWindow() ) ); connect( m_closeButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( closeCurrentWindow() ) );
setCornerWidget( m_closeButton, TopRight); setCornerWidget( m_closeButton, TopRight);
} }
@ -64,11 +64,11 @@ void KCHMViewWindowMgr::createMenu( KCHMMainWindow * parent )
m_MenuWindow = new KTQPopupMenu( parent ); m_MenuWindow = new KTQPopupMenu( parent );
parent->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, TQ_SLOT( closeCurrentWindow()), CTRL+Key_W );
m_MenuWindow->insertSeparator(); m_MenuWindow->insertSeparator();
//connect( m_MenuWindow, TQT_SIGNAL( activated(int) ), this, TQT_SLOT ( onCloseWindow(int) )); //connect( m_MenuWindow, TQ_SIGNAL( activated(int) ), this, TQ_SLOT ( onCloseWindow(int) ));
connect( m_MenuWindow, TQT_SIGNAL( activated(int) ), this, TQT_SLOT ( onActiveWindow(int) )); connect( m_MenuWindow, TQ_SIGNAL( activated(int) ), this, TQ_SLOT ( onActiveWindow(int) ));
} }
void KCHMViewWindowMgr::invalidate() void KCHMViewWindowMgr::invalidate()
@ -114,7 +114,7 @@ KCHMViewWindow * KCHMViewWindowMgr::addNewTab( bool set_active )
showPage( widget ); showPage( widget );
// Handle clicking on link in browser window // Handle clicking on link in browser window
connect( viewvnd->getTQObject(), TQT_SIGNAL( signalLinkClicked (const TQString &, bool &) ), ::mainWindow, TQT_SLOT( slotLinkClicked(const TQString &, bool &) ) ); connect( viewvnd->getTQObject(), TQ_SIGNAL( signalLinkClicked (const TQString &, bool &) ), ::mainWindow, TQ_SLOT( slotLinkClicked(const TQString &, bool &) ) );
return viewvnd; return viewvnd;
} }

2
src/main.cpp
Unescape View File

@ -87,7 +87,7 @@ int main( int argc, char ** argv )
mainWindow->show(); mainWindow->show();
#if !defined(USE_KDE) #if !defined(USE_KDE)
app.connect( &app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit()) ); app.connect( &app, TQ_SIGNAL(lastWindowClosed()), &app, TQ_SLOT(quit()) );
#else #else
app.setMainWidget( mainWindow ); app.setMainWidget( mainWindow );
#endif #endif

8
src/tde/kchmviewwindow_tdehtmlpart.cpp
Unescape View File

@ -46,11 +46,11 @@ KCHMViewWindow_TDEHTMLPart::KCHMViewWindow_TDEHTMLPart( TQTabWidget * parent )
invalidate(); invalidate();
connect( browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), connect( browserExtension(), TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ),
this, TQT_SLOT ( onOpenURLRequest( const KURL &, const KParts::URLArgs & )) ); this, TQ_SLOT ( onOpenURLRequest( const KURL &, const KParts::URLArgs & )) );
connect( this, TQT_SIGNAL ( popupMenu ( const TQString &, const TQPoint &) ), connect( this, TQ_SIGNAL ( popupMenu ( const TQString &, const TQPoint &) ),
this, TQT_SLOT ( onPopupMenu ( const TQString &, const TQPoint &) ) ); this, TQ_SLOT ( onPopupMenu ( const TQString &, const TQPoint &) ) );
} }

Write Preview
Loading…
Cancel
Save