summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/kchmbookmartwindow.cpp2
-rw-r--r--src/kchmbookmartwindow.h2
-rw-r--r--src/kchmindexwindow.cpp2
-rw-r--r--src/kchmindexwindow.h2
-rw-r--r--src/kchmmainwindow.cpp28
-rw-r--r--src/kchmsearchwindow.cpp2
-rw-r--r--src/kchmsearchwindow.h2
-rw-r--r--src/kchmsetupdialog.ui6
-rw-r--r--src/kchmviewwindow.cpp4
-rw-r--r--src/kchmviewwindow.h2
-rw-r--r--src/kchmviewwindow_qtextbrowser.cpp8
-rw-r--r--src/kchmviewwindow_qtextbrowser.h2
-rw-r--r--src/kchmviewwindowmgr.cpp2
-rw-r--r--src/kchmviewwindowmgr.h2
-rw-r--r--src/kde/kchmviewwindow_khtmlpart.cpp6
-rw-r--r--src/kde/kchmviewwindow_khtmlpart.h2
16 files changed, 37 insertions, 37 deletions
diff --git a/src/kchmbookmartwindow.cpp b/src/kchmbookmartwindow.cpp
index 3c43c6f..eda1814 100644
--- a/src/kchmbookmartwindow.cpp
+++ b/src/kchmbookmartwindow.cpp
@@ -182,7 +182,7 @@ void KCHMBookmarkWindow::saveSettings( KCHMSettings::bookmark_saved_settings_t &
}
}
-void KCHMBookmarkWindow::tqinvalidate( )
+void KCHMBookmarkWindow::invalidate( )
{
TQListViewItemIterator it( m_bookmarkList );
diff --git a/src/kchmbookmartwindow.h b/src/kchmbookmartwindow.h
index 98b2f67..546e9c9 100644
--- a/src/kchmbookmartwindow.h
+++ b/src/kchmbookmartwindow.h
@@ -41,7 +41,7 @@ class KCHMBookmarkWindow : public TQWidget
void restoreSettings (const KCHMSettings::bookmark_saved_settings_t& settings);
void saveSettings (KCHMSettings::bookmark_saved_settings_t& settings);
- void tqinvalidate();
+ void invalidate();
public slots:
void onAddBookmarkPressed ();
diff --git a/src/kchmindexwindow.cpp b/src/kchmindexwindow.cpp
index 01a7a8d..9473cf2 100644
--- a/src/kchmindexwindow.cpp
+++ b/src/kchmindexwindow.cpp
@@ -104,7 +104,7 @@ void KCHMIndexWindow::onReturnPressed( )
}
-void KCHMIndexWindow::tqinvalidate( )
+void KCHMIndexWindow::invalidate( )
{
m_indexList->clear();
m_indexListFilled = false;
diff --git a/src/kchmindexwindow.h b/src/kchmindexwindow.h
index 5c13bfc..ef1de70 100644
--- a/src/kchmindexwindow.h
+++ b/src/kchmindexwindow.h
@@ -37,7 +37,7 @@ class KCHMIndexWindow : public TQWidget
public:
KCHMIndexWindow ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 );
- void tqinvalidate();
+ void invalidate();
void search( const TQString& index );
public slots:
diff --git a/src/kchmmainwindow.cpp b/src/kchmmainwindow.cpp
index 1301e78..c6b0c3f 100644
--- a/src/kchmmainwindow.cpp
+++ b/src/kchmmainwindow.cpp
@@ -202,9 +202,9 @@ bool KCHMMainWindow::loadChmFile ( const TQString &fileName, bool call_open_page
showOrHideIndexWindow( m_tabIndexPage );
showOrHideSearchWindow( m_tabSearchPage );
- m_bookmarkWindow->tqinvalidate();
+ m_bookmarkWindow->invalidate();
m_navToolbar->updateIconStatus( false, false );
- m_viewWindowMgr->tqinvalidate();
+ m_viewWindowMgr->invalidate();
refreshCurrentBrowser();
if ( m_currentSettings->loadSettings (fileName) )
@@ -265,7 +265,7 @@ bool KCHMMainWindow::loadChmFile ( const TQString &fileName, bool call_open_page
mbox.exec();
statusBar()->message(
- i18n("Could not load file %1").tqarg(fileName),
+ i18n("Could not load file %1").arg(fileName),
2000 );
delete new_chmfile;
return false;
@@ -312,7 +312,7 @@ void KCHMMainWindow::refreshCurrentBrowser( )
setCaption ( title );
- currentBrowser()->tqinvalidate();
+ currentBrowser()->invalidate();
if ( m_contentsWindow )
m_contentsWindow->refillTableOfContents();
@@ -368,7 +368,7 @@ bool KCHMMainWindow::openPage( const TQString & srcurl, unsigned int flags )
case KCHMConfig::ACTION_ASK_USER:
if ( TQMessageBox::question(this,
i18n("%1 - remote link clicked - %2") . arg(APP_NAME) . arg(p1),
- i18n("A remote link %1 will start the external program to open it.\n\nDo you want to continue?").tqarg( url ),
+ i18n("A remote link %1 will start the external program to open it.\n\nDo you want to continue?").arg( url ),
i18n("&Yes"), i18n("&No"),
TQString(), 0, 1 ) )
return false;
@@ -403,7 +403,7 @@ bool KCHMMainWindow::openPage( const TQString & srcurl, unsigned int flags )
{
if ( TQMessageBox::question( this,
i18n( "%1 - link to a new CHM file clicked"). arg(APP_NAME),
- i18n( "You have clicked a link, which leads to a new CHM file %1.\nThe current file will be closed.\n\nDo you want to continue?").tqarg( p1 ),
+ i18n( "You have clicked a link, which leads to a new CHM file %1.\nThe current file will be closed.\n\nDo you want to continue?").arg( p1 ),
i18n( "&Yes" ), i18n( "&No" ),
TQString(), 0, 1 ) )
return false;
@@ -563,7 +563,7 @@ void KCHMMainWindow::setTextEncoding( const LCHMTextEncoding * encoding )
m_chmFile->setCurrentEncoding( encoding );
m_searchToolbar->setChosenEncodingInMenu( encoding );
- // Because updateView() will call view->tqinvalidate(), which clears the view->getOpenedPage(),
+ // Because updateView() will call view->invalidate(), which clears the view->getOpenedPage(),
// we have to make a copy of it.
TQString url = currentBrowser()->getOpenedPage();
@@ -809,14 +809,14 @@ void KCHMMainWindow::slotChangeSettingsMenuItemActivated()
&& appConfig.m_useSearchEngine == KCHMConfig::SEARCH_USE_CHM )
{
appConfig.m_useSearchEngine = KCHMConfig::SEARCH_USE_MINE;
- m_searchWindow->tqinvalidate();
+ m_searchWindow->invalidate();
}
if ( dlg.m_useSearchEngineInternal->isChecked()
&& appConfig.m_useSearchEngine == KCHMConfig::SEARCH_USE_MINE )
{
appConfig.m_useSearchEngine = KCHMConfig::SEARCH_USE_CHM;
- m_searchWindow->tqinvalidate();
+ m_searchWindow->invalidate();
}
appConfig.m_advExternalEditorPath = dlg.m_advExternalProgramName->text();
@@ -932,7 +932,7 @@ void KCHMMainWindow::showOrHideContextWindow( int tabindex )
void KCHMMainWindow::showOrHideIndexWindow( int tabindex )
{
- // Test whether to show/tqinvalidate the index window
+ // Test whether to show/invalidate the index window
if ( tabindex == -1 )
{
if ( m_indexWindow )
@@ -950,7 +950,7 @@ void KCHMMainWindow::showOrHideIndexWindow( int tabindex )
m_tabWidget->insertTab (m_indexWindow, i18n( "Index" ), tabindex);
}
else
- m_indexWindow->tqinvalidate();
+ m_indexWindow->invalidate();
}
}
@@ -973,7 +973,7 @@ void KCHMMainWindow::showOrHideSearchWindow( int tabindex )
m_tabWidget->insertTab (m_searchWindow, i18n( "Search" ), tabindex);
}
else
- m_searchWindow->tqinvalidate();
+ m_searchWindow->invalidate();
}
}
@@ -1178,12 +1178,12 @@ void KCHMMainWindow::locateInContentTree( const TQString & url )
void KCHMMainWindow::slotOnTreeDoubleClicked( TQListViewItem * item, const TQPoint &, int )
{
- // Open/close only existing item which have tqchildren
+ // Open/close only existing item which have children
if ( !item || item->childCount() == 0 )
return;
item->setOpen( !item->isOpen() );
- item->tqrepaint();
+ item->repaint();
}
bool KCHMMainWindow::event( TQEvent * e )
diff --git a/src/kchmsearchwindow.cpp b/src/kchmsearchwindow.cpp
index e6710f6..c760339 100644
--- a/src/kchmsearchwindow.cpp
+++ b/src/kchmsearchwindow.cpp
@@ -95,7 +95,7 @@ KCHMSearchWindow::KCHMSearchWindow( TQWidget * parent, const char * name, WFlags
m_searchEngine = 0;
}
-void KCHMSearchWindow::tqinvalidate( )
+void KCHMSearchWindow::invalidate( )
{
m_searchList->clear();
m_searchQuery->clear();
diff --git a/src/kchmsearchwindow.h b/src/kchmsearchwindow.h
index 165a864..3e9a985 100644
--- a/src/kchmsearchwindow.h
+++ b/src/kchmsearchwindow.h
@@ -59,7 +59,7 @@ class KCHMSearchWindow : public TQWidget
public:
KCHMSearchWindow ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 );
- void tqinvalidate();
+ void invalidate();
void restoreSettings (const KCHMSettings::search_saved_settings_t& settings);
void saveSettings (KCHMSettings::search_saved_settings_t& settings);
void execSearchQueryInGui( const TQString& query );
diff --git a/src/kchmsetupdialog.ui b/src/kchmsetupdialog.ui
index ddd63c4..6c60c73 100644
--- a/src/kchmsetupdialog.ui
+++ b/src/kchmsetupdialog.ui
@@ -298,7 +298,7 @@
<property name="text">
<string>Enter the path to the program, which will be used as a browser for external links. A &lt;i&gt;%s&lt;/i&gt; symbol will be replaced by the URL clicked.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -527,7 +527,7 @@
<property name="text">
<string>Use the search based on internal CHM index. This engine cannot search for any symbols except underscode, does not support multibyte languages, and is not always available.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -554,7 +554,7 @@
<property name="text">
<string>Use new kchmviewer internal search engine (recommended). This engine indexes symbols, so it is possible to search for special symbols (like "C++"). All languages are supported. The index will be generated before the first search.</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
diff --git a/src/kchmviewwindow.cpp b/src/kchmviewwindow.cpp
index 118e4b6..c0c1a4c 100644
--- a/src/kchmviewwindow.cpp
+++ b/src/kchmviewwindow.cpp
@@ -37,7 +37,7 @@
KCHMViewWindow::KCHMViewWindow( TQTabWidget * parent )
{
- tqinvalidate();
+ invalidate();
m_contextMenu = 0;
m_contextMenuLink = 0;
m_historyMaxSize = 25;
@@ -49,7 +49,7 @@ KCHMViewWindow::~KCHMViewWindow()
{
}
-void KCHMViewWindow::tqinvalidate( )
+void KCHMViewWindow::invalidate( )
{
m_base_url = "/";
m_openedPage = TQString();
diff --git a/src/kchmviewwindow.h b/src/kchmviewwindow.h
index 6dd59ac..fae779e 100644
--- a/src/kchmviewwindow.h
+++ b/src/kchmviewwindow.h
@@ -45,7 +45,7 @@ public:
public:
// virtual members, which should be implemented by viewers
//! Invalidate current view, doing all the cleanups etc.
- virtual void tqinvalidate();
+ virtual void invalidate();
//! Popups the print dialog, and prints the current page on the printer.
virtual bool printCurrentPage() = 0;
diff --git a/src/kchmviewwindow_qtextbrowser.cpp b/src/kchmviewwindow_qtextbrowser.cpp
index bd9aa33..dea8626 100644
--- a/src/kchmviewwindow_qtextbrowser.cpp
+++ b/src/kchmviewwindow_qtextbrowser.cpp
@@ -44,7 +44,7 @@ KCHMViewWindow_QTextBrowser::KCHMViewWindow_QTextBrowser( TQTabWidget * parent )
{
m_zoomfactor = 0;
m_sourcefactory = 0;
- tqinvalidate();
+ invalidate();
setTextFormat ( TQt::RichText );
connect( this, TQT_SIGNAL( linkClicked (const TQString &) ), this, TQT_SLOT( slotLinkClicked(const TQString &) ) );
@@ -93,7 +93,7 @@ void KCHMViewWindow_QTextBrowser::setZoomFactor( int zoom )
TQTextBrowser::zoomIn( zoom);
}
-void KCHMViewWindow_QTextBrowser::tqinvalidate( )
+void KCHMViewWindow_QTextBrowser::invalidate( )
{
delete m_sourcefactory;
m_sourcefactory = new KCHMSourceFactory (this);
@@ -105,7 +105,7 @@ void KCHMViewWindow_QTextBrowser::tqinvalidate( )
m_searchText = TQString();
reload();
- KCHMViewWindow::tqinvalidate( );
+ KCHMViewWindow::invalidate( );
}
int KCHMViewWindow_QTextBrowser::getScrollbarPosition( )
@@ -168,7 +168,7 @@ bool KCHMViewWindow_QTextBrowser::printCurrentPage( )
if ( view.top() >= richText.height() )
break;
- TQString msg = i18n( "Printing (page %1)...") .tqarg(page);
+ TQString msg = i18n( "Printing (page %1)...") .arg(page);
::mainWindow->showInStatusBar( msg );
printer.newPage();
diff --git a/src/kchmviewwindow_qtextbrowser.h b/src/kchmviewwindow_qtextbrowser.h
index 9eb3d3a..05d7836 100644
--- a/src/kchmviewwindow_qtextbrowser.h
+++ b/src/kchmviewwindow_qtextbrowser.h
@@ -42,7 +42,7 @@ public:
virtual bool openPage (const TQString& url);
//! Invalidate current view, doing all the cleanups etc.
- virtual void tqinvalidate();
+ virtual void invalidate();
//! Return current ZoomFactor.
virtual int getZoomFactor() const { return m_zoomfactor; }
diff --git a/src/kchmviewwindowmgr.cpp b/src/kchmviewwindowmgr.cpp
index 4023d7e..8b3dad9 100644
--- a/src/kchmviewwindowmgr.cpp
+++ b/src/kchmviewwindowmgr.cpp
@@ -71,7 +71,7 @@ void KCHMViewWindowMgr::createMenu( KCHMMainWindow * parent )
connect( m_MenuWindow, TQT_SIGNAL( activated(int) ), this, TQT_SLOT ( onActiveWindow(int) ));
}
-void KCHMViewWindowMgr::tqinvalidate()
+void KCHMViewWindowMgr::invalidate()
{
deleteAllWindows();
addNewTab( true );
diff --git a/src/kchmviewwindowmgr.h b/src/kchmviewwindowmgr.h
index 69a84a4..a4bdbfe 100644
--- a/src/kchmviewwindowmgr.h
+++ b/src/kchmviewwindowmgr.h
@@ -46,7 +46,7 @@ class KCHMViewWindowMgr : public TQTabWidget
// Sets the tab name and updates Windows menu
void setTabName( KCHMViewWindow* window );
- void tqinvalidate();
+ void invalidate();
// Creates a Window menu
void createMenu( KCHMMainWindow * parent );
diff --git a/src/kde/kchmviewwindow_khtmlpart.cpp b/src/kde/kchmviewwindow_khtmlpart.cpp
index d6cb639..4fe3b47 100644
--- a/src/kde/kchmviewwindow_khtmlpart.cpp
+++ b/src/kde/kchmviewwindow_khtmlpart.cpp
@@ -44,7 +44,7 @@ KCHMViewWindow_KHTMLPart::KCHMViewWindow_KHTMLPart( TQTabWidget * parent )
m_currentEncoding = 0;
m_searchForward = true;
- tqinvalidate();
+ invalidate();
connect( browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ),
this, TQT_SLOT ( onOpenURLRequest( const KURL &, const KParts::URLArgs & )) );
@@ -81,7 +81,7 @@ void KCHMViewWindow_KHTMLPart::setZoomFactor( int zoom )
KHTMLPart::setZoomFactor ( 100 + (m_zoomfactor * 10) );
}
-void KCHMViewWindow_KHTMLPart::tqinvalidate( )
+void KCHMViewWindow_KHTMLPart::invalidate( )
{
m_zoomfactor = 0;
m_searchForward = true;
@@ -92,7 +92,7 @@ void KCHMViewWindow_KHTMLPart::tqinvalidate( )
setMetaRefreshEnabled ( appConfig.m_kdeEnableRefresh );
setPluginsEnabled ( appConfig.m_kdeEnablePlugins );
- KCHMViewWindow::tqinvalidate( );
+ KCHMViewWindow::invalidate( );
}
int KCHMViewWindow_KHTMLPart::getScrollbarPosition( )
diff --git a/src/kde/kchmviewwindow_khtmlpart.h b/src/kde/kchmviewwindow_khtmlpart.h
index 178b103..76d4774 100644
--- a/src/kde/kchmviewwindow_khtmlpart.h
+++ b/src/kde/kchmviewwindow_khtmlpart.h
@@ -54,7 +54,7 @@ public:
virtual bool openPage (const TQString& url);
//! Invalidate current view, doing all the cleanups etc.
- virtual void tqinvalidate();
+ virtual void invalidate();
//! Return current ZoomFactor.
virtual int getZoomFactor() const { return m_zoomfactor; }
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-30 09:36:42 +0000