summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:56:02 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:56:02 -0600
commit71061104fa6242b2e0bf08b0920e08ee2f2924c5 (patch)
tree4e74a78c2e35494cf94c30414d14e884f557320f
parent60da1801389e3c729d440a353003acca39a7c3b6 (diff)
downloadkchmviewer-71061104fa6242b2e0bf08b0920e08ee2f2924c5.tar.gz
kchmviewer-71061104fa6242b2e0bf08b0920e08ee2f2924c5.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 60da1801389e3c729d440a353003acca39a7c3b6.
-rw-r--r--lib/libchmfile/libchmfile.h2
-rw-r--r--src/kchmbookmartwindow.cpp16
-rw-r--r--src/kchmbookmartwindow.h2
-rw-r--r--src/kchmdialogchooseurlfromlist.cpp14
-rw-r--r--src/kchmindexwindow.cpp14
-rw-r--r--src/kchmindexwindow.h2
-rw-r--r--src/kchmlistitemtooltip.h4
-rw-r--r--src/kchmmainwindow.cpp32
-rw-r--r--src/kchmnavtoolbar.cpp2
-rw-r--r--src/kchmnavtoolbar.h2
-rw-r--r--src/kchmsearchengine.cpp2
-rw-r--r--src/kchmsearchengine_impl.cpp2
-rw-r--r--src/kchmsearchtoolbar.cpp2
-rw-r--r--src/kchmsearchwindow.cpp32
-rw-r--r--src/kchmsearchwindow.h2
-rw-r--r--src/kchmsetupdialog.cpp140
-rw-r--r--src/kchmsetupdialog.ui14
-rw-r--r--src/kchmtreeviewitem.cpp2
-rw-r--r--src/kchmviewwindow.cpp16
-rw-r--r--src/kchmviewwindow.h2
-rw-r--r--src/kchmviewwindow_qtextbrowser.cpp10
-rw-r--r--src/kchmviewwindow_qtextbrowser.h2
-rw-r--r--src/kchmviewwindowmgr.cpp2
-rw-r--r--src/kchmviewwindowmgr.h2
-rw-r--r--src/kde-qt.h8
-rw-r--r--src/kde/kchmviewwindow_khtmlpart.cpp10
-rw-r--r--src/kde/kchmviewwindow_khtmlpart.h2
27 files changed, 170 insertions, 170 deletions
diff --git a/lib/libchmfile/libchmfile.h b/lib/libchmfile/libchmfile.h
index b5a101a..f94de0b 100644
--- a/lib/libchmfile/libchmfile.h
+++ b/lib/libchmfile/libchmfile.h
@@ -28,7 +28,7 @@
#include <tqlistbox.h>
#include <tqmap.h>
#include <tqvaluevector.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include "libchmtextencoding.h"
diff --git a/src/kchmbookmartwindow.cpp b/src/kchmbookmartwindow.cpp
index e5f6a19..3c43c6f 100644
--- a/src/kchmbookmartwindow.cpp
+++ b/src/kchmbookmartwindow.cpp
@@ -30,24 +30,24 @@
KCHMBookmarkWindow::KCHMBookmarkWindow(TQWidget *parent, const char *name)
: TQWidget(parent, name)
{
- TQVBoxLayout * layout = new TQVBoxLayout (this);
- layout->setMargin (5);
+ TQVBoxLayout * tqlayout = new TQVBoxLayout (this);
+ tqlayout->setMargin (5);
m_bookmarkList = new KQListView (this);
m_bookmarkList->addColumn( "bookmark" ); // no need to i18n - the column is hidden
m_bookmarkList->header()->hide();
- layout->addWidget (m_bookmarkList);
+ tqlayout->addWidget (m_bookmarkList);
new KCHMListItemTooltip( m_bookmarkList );
- TQHBoxLayout * hlayout = new TQHBoxLayout (layout);
+ TQHBoxLayout * htqlayout = new TQHBoxLayout (tqlayout);
TQPushButton * add = new TQPushButton ( i18n( "&Add" ), this);
TQPushButton * edit = new TQPushButton ( i18n( "&Edit" ), this);
TQPushButton * del = new TQPushButton ( i18n( "&Del" ), this);
- hlayout->addWidget (add);
- hlayout->addWidget (edit);
- hlayout->addWidget (del);
+ htqlayout->addWidget (add);
+ htqlayout->addWidget (edit);
+ htqlayout->addWidget (del);
connect( m_bookmarkList,
TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int) ),
@@ -182,7 +182,7 @@ void KCHMBookmarkWindow::saveSettings( KCHMSettings::bookmark_saved_settings_t &
}
}
-void KCHMBookmarkWindow::invalidate( )
+void KCHMBookmarkWindow::tqinvalidate( )
{
TQListViewItemIterator it( m_bookmarkList );
diff --git a/src/kchmbookmartwindow.h b/src/kchmbookmartwindow.h
index 546e9c9..98b2f67 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 invalidate();
+ void tqinvalidate();
public slots:
void onAddBookmarkPressed ();
diff --git a/src/kchmdialogchooseurlfromlist.cpp b/src/kchmdialogchooseurlfromlist.cpp
index 41bc64a..57db28e 100644
--- a/src/kchmdialogchooseurlfromlist.cpp
+++ b/src/kchmdialogchooseurlfromlist.cpp
@@ -27,8 +27,8 @@
KCHMDialogChooseUrlFromList::KCHMDialogChooseUrlFromList(const TQStringList& urls, const TQStringList& titles, TQWidget* parent)
: TQDialog(parent, 0, true)
{
- TQVBoxLayout * layout = new TQVBoxLayout (this);
- layout->setMargin (5);
+ TQVBoxLayout * tqlayout = new TQVBoxLayout (this);
+ tqlayout->setMargin (5);
TQListView * m_urlsList = new TQListView (this);
m_urlsList->addColumn( i18n( "Topics" ) );
@@ -36,15 +36,15 @@ KCHMDialogChooseUrlFromList::KCHMDialogChooseUrlFromList(const TQStringList& url
for ( unsigned int i = 0; i < urls.size(); i++ )
new KCHMSingleTreeViewItem (m_urlsList, titles[i], urls[i]);
- layout->addWidget ( new TQLabel( i18n( "Please select one of the topics below:"), this) );
- layout->addWidget ( m_urlsList );
+ tqlayout->addWidget ( new TQLabel( i18n( "Please select one of the topics below:"), this) );
+ tqlayout->addWidget ( m_urlsList );
- TQHBoxLayout * hlayout = new TQHBoxLayout (layout);
+ TQHBoxLayout * htqlayout = new TQHBoxLayout (tqlayout);
TQPushButton * bok = new TQPushButton( i18n( "&Ok" ), this);
TQPushButton * bcancel = new TQPushButton( i18n( "&Cancel" ), this);
- hlayout->addWidget (bok);
- hlayout->addWidget (bcancel);
+ htqlayout->addWidget (bok);
+ htqlayout->addWidget (bcancel);
connect( m_urlsList, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int) ), this, TQT_SLOT( onDoubleClicked ( TQListViewItem *, const TQPoint &, int) ) );
connect( m_urlsList, TQT_SIGNAL( currentChanged ( TQListViewItem *) ), this, TQT_SLOT( onCurrentChanged ( TQListViewItem *) ) );
diff --git a/src/kchmindexwindow.cpp b/src/kchmindexwindow.cpp
index 617eff3..01a7a8d 100644
--- a/src/kchmindexwindow.cpp
+++ b/src/kchmindexwindow.cpp
@@ -19,7 +19,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <layout.h>
+#include <tqlayout.h>
#include <tqheader.h>
#include "libchmfile.h"
@@ -34,8 +34,8 @@
KCHMIndexWindow::KCHMIndexWindow ( TQWidget * parent, const char * name, WFlags f )
: TQWidget (parent, name, f)
{
- TQVBoxLayout * layout = new TQVBoxLayout (this);
- layout->setMargin (5);
+ TQVBoxLayout * tqlayout = new TQVBoxLayout (this);
+ tqlayout->setMargin (5);
m_indexFinder = new TQLineEdit (this);
m_indexFinder->setFocus();
@@ -47,9 +47,9 @@ KCHMIndexWindow::KCHMIndexWindow ( TQWidget * parent, const char * name, WFlags
m_indexList->setShowToolTips(true);
//m_indexList->setSorting( 0, true );
- layout->addWidget (m_indexFinder);
- layout->addSpacing (10);
- layout->addWidget (m_indexList);
+ tqlayout->addWidget (m_indexFinder);
+ tqlayout->addSpacing (10);
+ tqlayout->addWidget (m_indexList);
connect( m_indexFinder,
TQT_SIGNAL( textChanged (const TQString &) ),
@@ -104,7 +104,7 @@ void KCHMIndexWindow::onReturnPressed( )
}
-void KCHMIndexWindow::invalidate( )
+void KCHMIndexWindow::tqinvalidate( )
{
m_indexList->clear();
m_indexListFilled = false;
diff --git a/src/kchmindexwindow.h b/src/kchmindexwindow.h
index ef1de70..5c13bfc 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 invalidate();
+ void tqinvalidate();
void search( const TQString& index );
public slots:
diff --git a/src/kchmlistitemtooltip.h b/src/kchmlistitemtooltip.h
index 8bf43bf..46bd2f6 100644
--- a/src/kchmlistitemtooltip.h
+++ b/src/kchmlistitemtooltip.h
@@ -47,13 +47,13 @@ class KCHMListItemTooltip : public TQToolTip
int section = m_pParent->header()->sectionAt (pos.x ());
// Get the rect of the whole item (the row for the tip)
- TQRect itemRect = m_pParent->itemRect( it );
+ TQRect tqitemRect = m_pParent->tqitemRect( it );
// Get the rect of the whole section (the column for the tip)
TQRect headerRect = m_pParent->header ()->sectionRect (section);
// "Intersect" row and column to get exact rect for the tip
- TQRect destRect( headerRect.left (), itemRect.top(), headerRect.width(), itemRect.height() );
+ TQRect destRect( headerRect.left (), tqitemRect.top(), headerRect.width(), tqitemRect.height() );
int item_width = it->width( m_pParent->fontMetrics(), m_pParent, 0 )
+ it->depth() * m_pParent->treeStepSize();
diff --git a/src/kchmmainwindow.cpp b/src/kchmmainwindow.cpp
index 31130dd..04530a9 100644
--- a/src/kchmmainwindow.cpp
+++ b/src/kchmmainwindow.cpp
@@ -82,7 +82,7 @@ KCHMMainWindow::KCHMMainWindow()
m_currentSettings = new KCHMSettings;
- // Create the initial layout - a splitter with tab window in left, and text browser in right
+ // Create the initial tqlayout - a splitter with tab window in left, and text browser in right
m_windowSplitter = new TQSplitter(this);
m_tabWidget = new KTQTabWidget( m_windowSplitter );
m_viewWindowMgr = new KCHMViewWindowMgr( m_windowSplitter );
@@ -202,9 +202,9 @@ bool KCHMMainWindow::loadChmFile ( const TQString &fileName, bool call_open_page
showOrHideIndexWindow( m_tabIndexPage );
showOrHideSearchWindow( m_tabSearchPage );
- m_bookmarkWindow->invalidate();
- m_navToolbar->updateIconStatus( false, false );
- m_viewWindowMgr->invalidate();
+ m_bookmarkWindow->tqinvalidate();
+ m_navToolbar->updateIcontqStatus( false, false );
+ m_viewWindowMgr->tqinvalidate();
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").arg(fileName),
+ i18n("Could not load file %1").tqarg(fileName),
2000 );
delete new_chmfile;
return false;
@@ -312,7 +312,7 @@ void KCHMMainWindow::refreshCurrentBrowser( )
setCaption ( title );
- currentBrowser()->invalidate();
+ currentBrowser()->tqinvalidate();
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?").arg( url ),
+ i18n("A remote link %1 will start the external program to open it.\n\nDo you want to continue?").tqarg( 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?").arg( 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?").tqarg( 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->invalidate(), which clears the view->getOpenedPage(),
+ // Because updateView() will call view->tqinvalidate(), 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->invalidate();
+ m_searchWindow->tqinvalidate();
}
if ( dlg.m_useSearchEngineInternal->isChecked()
&& appConfig.m_useSearchEngine == KCHMConfig::SEARCH_USE_MINE )
{
appConfig.m_useSearchEngine = KCHMConfig::SEARCH_USE_CHM;
- m_searchWindow->invalidate();
+ m_searchWindow->tqinvalidate();
}
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/invalidate the index window
+ // Test whether to show/tqinvalidate 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->invalidate();
+ m_indexWindow->tqinvalidate();
}
}
@@ -973,7 +973,7 @@ void KCHMMainWindow::showOrHideSearchWindow( int tabindex )
m_tabWidget->insertTab (m_searchWindow, i18n( "Search" ), tabindex);
}
else
- m_searchWindow->invalidate();
+ m_searchWindow->tqinvalidate();
}
}
@@ -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 children
+ // Open/close only existing item which have tqchildren
if ( !item || item->childCount() == 0 )
return;
item->setOpen( !item->isOpen() );
- item->repaint();
+ item->tqrepaint();
}
bool KCHMMainWindow::event( TQEvent * e )
diff --git a/src/kchmnavtoolbar.cpp b/src/kchmnavtoolbar.cpp
index de42ece..e0e8790 100644
--- a/src/kchmnavtoolbar.cpp
+++ b/src/kchmnavtoolbar.cpp
@@ -65,7 +65,7 @@ KCHMNavToolbar::~KCHMNavToolbar()
{
}
-void KCHMNavToolbar::updateIconStatus( bool enable_backward, bool enable_forward )
+void KCHMNavToolbar::updateIcontqStatus( bool enable_backward, bool enable_forward )
{
m_toolbarIconBackward->setEnabled( enable_backward );
m_toolbarIconForward->setEnabled ( enable_forward );
diff --git a/src/kchmnavtoolbar.h b/src/kchmnavtoolbar.h
index d072f2a..734436f 100644
--- a/src/kchmnavtoolbar.h
+++ b/src/kchmnavtoolbar.h
@@ -33,7 +33,7 @@ public:
~KCHMNavToolbar();
public slots:
- void updateIconStatus( bool enable_backward, bool enable_forward );
+ void updateIcontqStatus( bool enable_backward, bool enable_forward );
private:
TQToolButton * m_toolbarIconBackward;
diff --git a/src/kchmsearchengine.cpp b/src/kchmsearchengine.cpp
index e9e2a35..a5f0a11 100644
--- a/src/kchmsearchengine.cpp
+++ b/src/kchmsearchengine.cpp
@@ -103,7 +103,7 @@ bool KCHMSearchEngine::loadOrGenerateIndex( )
// Process the list keeping only HTML documents there
for ( unsigned int i = 0; i < alldocuments.size(); i++ )
- if ( alldocuments[i].endsWith( ".html", false ) || alldocuments[i].endsWith( ".htm", false ) )
+ if ( alldocuments[i].tqendsWith( ".html", false ) || alldocuments[i].tqendsWith( ".htm", false ) )
documents.push_back( LCHMUrlFactory::makeURLabsoluteIfNeeded( alldocuments[i] ) );
m_Index->setDocList( documents );
diff --git a/src/kchmsearchengine_impl.cpp b/src/kchmsearchengine_impl.cpp
index b4b2c3a..646f261 100644
--- a/src/kchmsearchengine_impl.cpp
+++ b/src/kchmsearchengine_impl.cpp
@@ -195,7 +195,7 @@ bool Index::parseDocumentToStringlist( const TQString & filename, TQStringList &
TQChar ch = text[j];
if ( (j % 20000) == 0 )
- tqApp->processEvents( TQEventLoop::ExcludeUserInput );
+ tqApp->tqprocessEvents( TQEventLoop::ExcludeUserInput );
if ( state == STATE_IN_HTML_TAG )
{
diff --git a/src/kchmsearchtoolbar.cpp b/src/kchmsearchtoolbar.cpp
index 20e99c9..a51bb5f 100644
--- a/src/kchmsearchtoolbar.cpp
+++ b/src/kchmsearchtoolbar.cpp
@@ -22,7 +22,7 @@
#include <tqtoolbutton.h>
#include <tqcombobox.h>
#include <tqlineedit.h>
-#include <textedit.h>
+#include <tqtextedit.h>
#include <tqaccel.h>
#include <tqpopupmenu.h>
#include <tqmenubar.h>
diff --git a/src/kchmsearchwindow.cpp b/src/kchmsearchwindow.cpp
index be0122c..7e5af5b 100644
--- a/src/kchmsearchwindow.cpp
+++ b/src/kchmsearchwindow.cpp
@@ -34,33 +34,33 @@
KCHMSearchWindow::KCHMSearchWindow( TQWidget * parent, const char * name, WFlags f )
: TQWidget (parent, name, f)
{
- TQVBoxLayout * layout = new TQVBoxLayout (this);
- layout->setMargin(6);
- layout->setSpacing(6);
+ TQVBoxLayout * tqlayout = new TQVBoxLayout (this);
+ tqlayout->setMargin(6);
+ tqlayout->setSpacing(6);
// Labels <type words to search> and <help>
- TQHBoxLayout * labellayout = new TQHBoxLayout();
- labellayout->addWidget( new TQLabel( i18n( "Type in word(s) to search for:"), this) );
- labellayout->addStretch( 10 );
+ TQHBoxLayout * labeltqlayout = new TQHBoxLayout();
+ labeltqlayout->addWidget( new TQLabel( i18n( "Type in word(s) to search for:"), this) );
+ labeltqlayout->addStretch( 10 );
KCHMClickableLabel * helplink = new KCHMClickableLabel( i18n( "<a href=\"q\"><b>Help</b></a>"), this );
connect( helplink, TQT_SIGNAL( clicked() ), this, TQT_SLOT( onHelpClicked() ) );
helplink->setCursor( TQCursor( TQt::PointingHandCursor ) );
- labellayout->addWidget ( helplink );
- layout->addLayout( labellayout );
+ labeltqlayout->addWidget ( helplink );
+ tqlayout->addLayout( labeltqlayout );
m_searchQuery = new TQComboBox (TRUE, this);
m_searchQuery->setFocus();
m_searchQuery->setMaxCount (10);
- m_searchQuery->setSizePolicy ( TQSizePolicy ( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
+ m_searchQuery->tqsetSizePolicy ( TQSizePolicy ( TQSizePolicy::Expanding, TQSizePolicy::Fixed ) );
TQPushButton * searchButton = new TQPushButton ( i18n("Go"), this);
- searchButton->setSizePolicy ( TQSizePolicy ( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
+ searchButton->tqsetSizePolicy ( TQSizePolicy ( TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
- TQHBoxLayout * hlayout = new TQHBoxLayout ( layout );
- hlayout->addWidget ( m_searchQuery );
- hlayout->addWidget ( searchButton );
+ TQHBoxLayout * htqlayout = new TQHBoxLayout ( tqlayout );
+ htqlayout->addWidget ( m_searchQuery );
+ htqlayout->addWidget ( searchButton );
m_searchList = new KQListView (this);
m_searchList->addColumn( i18n( "Title" ) );
@@ -87,15 +87,15 @@ KCHMSearchWindow::KCHMSearchWindow( TQWidget * parent, const char * name, WFlags
this,
TQT_SLOT( slotContextMenuRequested ( TQListViewItem *, const TQPoint &, int ) ) );
- //layout->addSpacing (10);
- layout->addWidget (m_searchList);
+ //tqlayout->addSpacing (10);
+ tqlayout->addWidget (m_searchList);
new KCHMListItemTooltip( m_searchList );
m_contextMenu = 0;
m_searchEngine = 0;
}
-void KCHMSearchWindow::invalidate( )
+void KCHMSearchWindow::tqinvalidate( )
{
m_searchList->clear();
m_searchQuery->clear();
diff --git a/src/kchmsearchwindow.h b/src/kchmsearchwindow.h
index 3e9a985..165a864 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 invalidate();
+ void tqinvalidate();
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.cpp b/src/kchmsetupdialog.cpp
index 347520e..55b643e 100644
--- a/src/kchmsetupdialog.cpp
+++ b/src/kchmsetupdialog.cpp
@@ -20,7 +20,7 @@
#include <tqcheckbox.h>
#include <tqgroupbox.h>
#include <tqlineedit.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
@@ -36,7 +36,7 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
{
if ( !name )
setName( "MyDialog1" );
- setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, sizePolicy().hasHeightForWidth() ) );
+ tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)1, 0, 0, sizePolicy().hasHeightForWidth() ) );
setSizeGripEnabled( FALSE );
setModal( TRUE );
MyDialog1Layout = new TQVBoxLayout( this, 11, 6, "MyDialog1Layout");
@@ -47,60 +47,60 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
Widget8 = new TQWidget( tabWidget, "Widget8" );
Widget8Layout = new TQVBoxLayout( Widget8, 11, 6, "Widget8Layout");
- layout4 = new TQHBoxLayout( 0, 0, 6, "layout4");
+ tqlayout4 = new TQHBoxLayout( 0, 0, 6, "tqlayout4");
buttonGroup1 = new TQButtonGroup( Widget8, "buttonGroup1" );
buttonGroup1->setColumnLayout(0, Qt::Vertical );
- buttonGroup1->layout()->setSpacing( 6 );
- buttonGroup1->layout()->setMargin( 11 );
- buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->layout() );
- buttonGroup1Layout->setAlignment( TQt::AlignTop );
+ buttonGroup1->tqlayout()->setSpacing( 6 );
+ buttonGroup1->tqlayout()->setMargin( 11 );
+ buttonGroup1Layout = new TQVBoxLayout( buttonGroup1->tqlayout() );
+ buttonGroup1Layout->tqsetAlignment( TQt::AlignTop );
m_radioOnBeginOpenDialog = new TQRadioButton( buttonGroup1, "m_radioOnBeginOpenDialog" );
buttonGroup1Layout->addWidget( m_radioOnBeginOpenDialog );
m_radioOnBeginOpenLast = new TQRadioButton( buttonGroup1, "m_radioOnBeginOpenLast" );
buttonGroup1Layout->addWidget( m_radioOnBeginOpenLast );
- layout4->addWidget( buttonGroup1 );
+ tqlayout4->addWidget( buttonGroup1 );
buttonGroup2 = new TQButtonGroup( Widget8, "buttonGroup2" );
buttonGroup2->setColumnLayout(0, Qt::Vertical );
- buttonGroup2->layout()->setSpacing( 6 );
- buttonGroup2->layout()->setMargin( 11 );
- buttonGroup2Layout = new TQVBoxLayout( buttonGroup2->layout() );
- buttonGroup2Layout->setAlignment( TQt::AlignTop );
+ buttonGroup2->tqlayout()->setSpacing( 6 );
+ buttonGroup2->tqlayout()->setMargin( 11 );
+ buttonGroup2Layout = new TQVBoxLayout( buttonGroup2->tqlayout() );
+ buttonGroup2Layout->tqsetAlignment( TQt::AlignTop );
- layout3 = new TQHBoxLayout( 0, 0, 6, "layout3");
+ tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3");
textLabel1 = new TQLabel( buttonGroup2, "textLabel1" );
- layout3->addWidget( textLabel1 );
+ tqlayout3->addWidget( textLabel1 );
m_historySize = new TQSpinBox( buttonGroup2, "m_historySize" );
m_historySize->setValue( 10 );
- layout3->addWidget( m_historySize );
+ tqlayout3->addWidget( m_historySize );
textLabel2 = new TQLabel( buttonGroup2, "textLabel2" );
- layout3->addWidget( textLabel2 );
- buttonGroup2Layout->addLayout( layout3 );
+ tqlayout3->addWidget( textLabel2 );
+ buttonGroup2Layout->addLayout( tqlayout3 );
m_rememberHistoryInfo = new TQCheckBox( buttonGroup2, "m_rememberHistoryInfo" );
buttonGroup2Layout->addWidget( m_rememberHistoryInfo );
- layout4->addWidget( buttonGroup2 );
- Widget8Layout->addLayout( layout4 );
+ tqlayout4->addWidget( buttonGroup2 );
+ Widget8Layout->addLayout( tqlayout4 );
groupBox1 = new TQGroupBox( Widget8, "groupBox1" );
groupBox1->setColumnLayout(0, Qt::Vertical );
- groupBox1->layout()->setSpacing( 6 );
- groupBox1->layout()->setMargin( 11 );
- groupBox1Layout = new TQHBoxLayout( groupBox1->layout() );
- groupBox1Layout->setAlignment( TQt::AlignTop );
+ groupBox1->tqlayout()->setSpacing( 6 );
+ groupBox1->tqlayout()->setMargin( 11 );
+ groupBox1Layout = new TQHBoxLayout( groupBox1->tqlayout() );
+ groupBox1Layout->tqsetAlignment( TQt::AlignTop );
buttonGroup4 = new TQButtonGroup( groupBox1, "buttonGroup4" );
buttonGroup4->setColumnLayout(0, Qt::Vertical );
- buttonGroup4->layout()->setSpacing( 6 );
- buttonGroup4->layout()->setMargin( 11 );
- buttonGroup4Layout = new TQVBoxLayout( buttonGroup4->layout() );
- buttonGroup4Layout->setAlignment( TQt::AlignTop );
+ buttonGroup4->tqlayout()->setSpacing( 6 );
+ buttonGroup4->tqlayout()->setMargin( 11 );
+ buttonGroup4Layout = new TQVBoxLayout( buttonGroup4->tqlayout() );
+ buttonGroup4Layout->tqsetAlignment( TQt::AlignTop );
m_radioExtLinkOpenAlways = new TQRadioButton( buttonGroup4, "m_radioExtLinkOpenAlways" );
buttonGroup4Layout->addWidget( m_radioExtLinkOpenAlways );
@@ -114,10 +114,10 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
buttonGroup5 = new TQButtonGroup( groupBox1, "buttonGroup5" );
buttonGroup5->setColumnLayout(0, Qt::Vertical );
- buttonGroup5->layout()->setSpacing( 6 );
- buttonGroup5->layout()->setMargin( 11 );
- buttonGroup5Layout = new TQVBoxLayout( buttonGroup5->layout() );
- buttonGroup5Layout->setAlignment( TQt::AlignTop );
+ buttonGroup5->tqlayout()->setSpacing( 6 );
+ buttonGroup5->tqlayout()->setMargin( 11 );
+ buttonGroup5Layout = new TQVBoxLayout( buttonGroup5->tqlayout() );
+ buttonGroup5Layout->tqsetAlignment( TQt::AlignTop );
m_radioNewChmOpenAlways = new TQRadioButton( buttonGroup5, "m_radioNewChmOpenAlways" );
buttonGroup5Layout->addWidget( m_radioNewChmOpenAlways );
@@ -129,42 +129,42 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
buttonGroup5Layout->addWidget( m_radioNewChmOpenNever );
groupBox1Layout->addWidget( buttonGroup5 );
Widget8Layout->addWidget( groupBox1 );
- tabWidget->insertTab( Widget8, TQString::fromLatin1("") );
+ tabWidget->insertTab( Widget8, TQString::tqfromLatin1("") );
Widget9 = new TQWidget( tabWidget, "Widget9" );
Widget9Layout = new TQVBoxLayout( Widget9, 11, 6, "Widget9Layout");
m_groupQtsettings = new TQGroupBox( Widget9, "m_groupQtsettings" );
m_groupQtsettings->setColumnLayout(0, Qt::Vertical );
- m_groupQtsettings->layout()->setSpacing( 6 );
- m_groupQtsettings->layout()->setMargin( 11 );
- m_groupQtsettingsLayout = new TQHBoxLayout( m_groupQtsettings->layout() );
- m_groupQtsettingsLayout->setAlignment( TQt::AlignTop );
+ m_groupQtsettings->tqlayout()->setSpacing( 6 );
+ m_groupQtsettings->tqlayout()->setMargin( 11 );
+ m_groupQtsettingsLayout = new TQHBoxLayout( m_groupQtsettings->tqlayout() );
+ m_groupQtsettingsLayout->tqsetAlignment( TQt::AlignTop );
textLabel1_2 = new TQLabel( m_groupQtsettings, "textLabel1_2" );
- textLabel1_2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, textLabel1_2->sizePolicy().hasHeightForWidth() ) );
+ textLabel1_2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)7, 0, 0, textLabel1_2->sizePolicy().hasHeightForWidth() ) );
textLabel1_2->setLineWidth( 1 );
- textLabel1_2->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+ textLabel1_2->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
m_groupQtsettingsLayout->addWidget( textLabel1_2 );
m_qtBrowserPath = new TQLineEdit( m_groupQtsettings, "m_qtBrowserPath" );
- m_qtBrowserPath->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_qtBrowserPath->sizePolicy().hasHeightForWidth() ) );
+ m_qtBrowserPath->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)1, (TQSizePolicy::SizeType)0, 0, 0, m_qtBrowserPath->sizePolicy().hasHeightForWidth() ) );
m_groupQtsettingsLayout->addWidget( m_qtBrowserPath );
Widget9Layout->addWidget( m_groupQtsettings );
m_groupKDEsettings = new TQGroupBox( Widget9, "m_groupKDEsettings" );
m_groupKDEsettings->setColumnLayout(0, Qt::Vertical );
- m_groupKDEsettings->layout()->setSpacing( 6 );
- m_groupKDEsettings->layout()->setMargin( 11 );
- m_groupKDEsettingsLayout = new TQHBoxLayout( m_groupKDEsettings->layout() );
- m_groupKDEsettingsLayout->setAlignment( TQt::AlignTop );
+ m_groupKDEsettings->tqlayout()->setSpacing( 6 );
+ m_groupKDEsettings->tqlayout()->setMargin( 11 );
+ m_groupKDEsettingsLayout = new TQHBoxLayout( m_groupKDEsettings->tqlayout() );
+ m_groupKDEsettingsLayout->tqsetAlignment( TQt::AlignTop );
buttonGroup5_2 = new TQButtonGroup( m_groupKDEsettings, "buttonGroup5_2" );
buttonGroup5_2->setColumnLayout(0, Qt::Vertical );
- buttonGroup5_2->layout()->setSpacing( 6 );
- buttonGroup5_2->layout()->setMargin( 11 );
- buttonGroup5_2Layout = new TQVBoxLayout( buttonGroup5_2->layout() );
- buttonGroup5_2Layout->setAlignment( TQt::AlignTop );
+ buttonGroup5_2->tqlayout()->setSpacing( 6 );
+ buttonGroup5_2->tqlayout()->setMargin( 11 );
+ buttonGroup5_2Layout = new TQVBoxLayout( buttonGroup5_2->tqlayout() );
+ buttonGroup5_2Layout->tqsetAlignment( TQt::AlignTop );
m_radioUseQtextBrowser = new TQRadioButton( buttonGroup5_2, "m_radioUseQtextBrowser" );
buttonGroup5_2Layout->addWidget( m_radioUseQtextBrowser );
@@ -175,10 +175,10 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
groupKhtmlSecurity = new TQGroupBox( m_groupKDEsettings, "groupKhtmlSecurity" );
groupKhtmlSecurity->setColumnLayout(0, Qt::Vertical );
- groupKhtmlSecurity->layout()->setSpacing( 6 );
- groupKhtmlSecurity->layout()->setMargin( 11 );
- groupKhtmlSecurityLayout = new TQGridLayout( groupKhtmlSecurity->layout() );
- groupKhtmlSecurityLayout->setAlignment( TQt::AlignTop );
+ groupKhtmlSecurity->tqlayout()->setSpacing( 6 );
+ groupKhtmlSecurity->tqlayout()->setMargin( 11 );
+ groupKhtmlSecurityLayout = new TQGridLayout( groupKhtmlSecurity->tqlayout() );
+ groupKhtmlSecurityLayout->tqsetAlignment( TQt::AlignTop );
m_enableJS = new TQCheckBox( groupKhtmlSecurity, "m_enableJS" );
@@ -197,17 +197,17 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
groupKhtmlSecurityLayout->addWidget( m_enableRefresh, 1, 1 );
m_groupKDEsettingsLayout->addWidget( groupKhtmlSecurity );
Widget9Layout->addWidget( m_groupKDEsettings );
- tabWidget->insertTab( Widget9, TQString::fromLatin1("") );
+ tabWidget->insertTab( Widget9, TQString::tqfromLatin1("") );
TabPage = new TQWidget( tabWidget, "TabPage" );
TabPageLayout = new TQVBoxLayout( TabPage, 11, 6, "TabPageLayout");
buttonGroup7 = new TQButtonGroup( TabPage, "buttonGroup7" );
buttonGroup7->setColumnLayout(0, Qt::Vertical );
- buttonGroup7->layout()->setSpacing( 6 );
- buttonGroup7->layout()->setMargin( 11 );
- buttonGroup7Layout = new TQVBoxLayout( buttonGroup7->layout() );
- buttonGroup7Layout->setAlignment( TQt::AlignTop );
+ buttonGroup7->tqlayout()->setSpacing( 6 );
+ buttonGroup7->tqlayout()->setMargin( 11 );
+ buttonGroup7Layout = new TQVBoxLayout( buttonGroup7->tqlayout() );
+ buttonGroup7Layout->tqsetAlignment( TQt::AlignTop );
m_advViewSourceInternal = new TQRadioButton( buttonGroup7, "m_advViewSourceInternal" );
buttonGroup7Layout->addWidget( m_advViewSourceInternal );
@@ -215,30 +215,30 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
m_advViewSourceExternal = new TQRadioButton( buttonGroup7, "m_advViewSourceExternal" );
buttonGroup7Layout->addWidget( m_advViewSourceExternal );
- layout4_2 = new TQHBoxLayout( 0, 0, 6, "layout4_2");
+ tqlayout4_2 = new TQHBoxLayout( 0, 0, 6, "tqlayout4_2");
textLabel1_3 = new TQLabel( buttonGroup7, "textLabel1_3" );
- layout4_2->addWidget( textLabel1_3 );
+ tqlayout4_2->addWidget( textLabel1_3 );
m_advExternalProgramName = new TQLineEdit( buttonGroup7, "m_advExternalProgramName" );
- layout4_2->addWidget( m_advExternalProgramName );
- buttonGroup7Layout->addLayout( layout4_2 );
+ tqlayout4_2->addWidget( m_advExternalProgramName );
+ buttonGroup7Layout->addLayout( tqlayout4_2 );
TabPageLayout->addWidget( buttonGroup7 );
groupBox6 = new TQButtonGroup( TabPage, "groupBox6" );
groupBox6->setColumnLayout(0, Qt::Vertical );
- groupBox6->layout()->setSpacing( 6 );
- groupBox6->layout()->setMargin( 11 );
- groupBox6Layout = new TQGridLayout( groupBox6->layout() );
- groupBox6Layout->setAlignment( TQt::AlignTop );
+ groupBox6->tqlayout()->setSpacing( 6 );
+ groupBox6->tqlayout()->setMargin( 11 );
+ groupBox6Layout = new TQGridLayout( groupBox6->tqlayout() );
+ groupBox6Layout->tqsetAlignment( TQt::AlignTop );
m_useSearchEngineInternal = new TQRadioButton( groupBox6, "m_useSearchEngineInternal" );
groupBox6Layout->addWidget( m_useSearchEngineInternal, 1, 0 );
m_labelUseSearchEngineInternal = new TQLabel( groupBox6, "m_labelUseSearchEngineInternal" );
- m_labelUseSearchEngineInternal->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 10, 0, m_labelUseSearchEngineInternal->sizePolicy().hasHeightForWidth() ) );
- m_labelUseSearchEngineInternal->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+ m_labelUseSearchEngineInternal->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 10, 0, m_labelUseSearchEngineInternal->sizePolicy().hasHeightForWidth() ) );
+ m_labelUseSearchEngineInternal->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
groupBox6Layout->addWidget( m_labelUseSearchEngineInternal, 1, 1 );
@@ -247,12 +247,12 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
groupBox6Layout->addWidget( m_useSearchEngineNew, 0, 0 );
m_labelUseSearchEngineNew = new TQLabel( groupBox6, "m_labelUseSearchEngineNew" );
- m_labelUseSearchEngineNew->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 10, 0, m_labelUseSearchEngineNew->sizePolicy().hasHeightForWidth() ) );
- m_labelUseSearchEngineNew->setAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
+ m_labelUseSearchEngineNew->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 10, 0, m_labelUseSearchEngineNew->sizePolicy().hasHeightForWidth() ) );
+ m_labelUseSearchEngineNew->tqsetAlignment( int( TQLabel::WordBreak | TQLabel::AlignVCenter ) );
groupBox6Layout->addWidget( m_labelUseSearchEngineNew, 0, 1 );
TabPageLayout->addWidget( groupBox6 );
- tabWidget->insertTab( TabPage, TQString::fromLatin1("") );
+ tabWidget->insertTab( TabPage, TQString::tqfromLatin1("") );
MyDialog1Layout->addWidget( tabWidget );
Layout1 = new TQHBoxLayout( 0, 0, 6, "Layout1");
@@ -273,7 +273,7 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
Layout1->addWidget( buttonCancel );
MyDialog1Layout->addLayout( Layout1 );
languageChange();
- resize( TQSize(654, 343).expandedTo(minimumSizeHint()) );
+ resize( TQSize(654, 343).expandedTo(tqminimumSizeHint()) );
clearWState( WState_Polished );
// signals and slots connections
diff --git a/src/kchmsetupdialog.ui b/src/kchmsetupdialog.ui
index f4e3ca0..a981ec4 100644
--- a/src/kchmsetupdialog.ui
+++ b/src/kchmsetupdialog.ui
@@ -59,7 +59,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<hbox>
<property name="name">
@@ -110,7 +110,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout3</cstring>
+ <cstring>tqlayout3</cstring>
</property>
<hbox>
<property name="name">
@@ -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="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -470,7 +470,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>layout4</cstring>
+ <cstring>tqlayout4</cstring>
</property>
<hbox>
<property name="name">
@@ -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="alignment">
+ <property name="tqalignment">
<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="alignment">
+ <property name="tqalignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -601,7 +601,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="sizeHint">
+ <property name="tqsizeHint">
<size>
<width>20</width>
<height>20</height>
diff --git a/src/kchmtreeviewitem.cpp b/src/kchmtreeviewitem.cpp
index ccd4776..11e91e6 100644
--- a/src/kchmtreeviewitem.cpp
+++ b/src/kchmtreeviewitem.cpp
@@ -101,7 +101,7 @@ void KCHMIndTocItem::paintBranches( TQPainter * p, const TQColorGroup & cg, int
TQStyleOption opt( 0, 0 );
TQStyle::SFlags how = TQStyle::Style_Default | TQStyle::Style_Enabled;
- listView()->tqstyle().drawComplexControl( TQStyle::CC_ListView,
+ listView()->tqstyle().tqdrawComplexControl( TQStyle::CC_ListView,
p, listView(), TQRect( 0, 0, w, h ), cg,
how, TQStyle::SC_ListView, TQStyle::SC_None,
opt );
diff --git a/src/kchmviewwindow.cpp b/src/kchmviewwindow.cpp
index c0c1a4c..fc77d3e 100644
--- a/src/kchmviewwindow.cpp
+++ b/src/kchmviewwindow.cpp
@@ -37,7 +37,7 @@
KCHMViewWindow::KCHMViewWindow( TQTabWidget * parent )
{
- invalidate();
+ tqinvalidate();
m_contextMenu = 0;
m_contextMenuLink = 0;
m_historyMaxSize = 25;
@@ -49,7 +49,7 @@ KCHMViewWindow::~KCHMViewWindow()
{
}
-void KCHMViewWindow::invalidate( )
+void KCHMViewWindow::tqinvalidate( )
{
m_base_url = "/";
m_openedPage = TQString();
@@ -132,11 +132,11 @@ bool KCHMViewWindow::openUrl ( const TQString& origurl )
void KCHMViewWindow::handleStartPageAsImage( TQString & link )
{
// Handle pics
- if ( link.endsWith( ".jpg", false )
- || link.endsWith( ".jpeg", false )
- || link.endsWith( ".gif", false )
- || link.endsWith( ".png", false )
- || link.endsWith( ".bmp", false ) )
+ if ( link.tqendsWith( ".jpg", false )
+ || link.tqendsWith( ".jpeg", false )
+ || link.tqendsWith( ".gif", false )
+ || link.tqendsWith( ".png", false )
+ || link.tqendsWith( ".bmp", false ) )
link += LCHMUrlFactory::getInternalUriExtension();
}
@@ -274,7 +274,7 @@ void KCHMViewWindow::updateNavigationToolbar( )
if ( mainWindow )
{
- mainWindow->navigationToolbar()->updateIconStatus(
+ mainWindow->navigationToolbar()->updateIcontqStatus(
m_historyCurrentPos > 0,
m_historyCurrentPos < (m_history.size() - 1) );
}
diff --git a/src/kchmviewwindow.h b/src/kchmviewwindow.h
index fae779e..6dd59ac 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 invalidate();
+ virtual void tqinvalidate();
//! 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 dea8626..f66dc88 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;
- invalidate();
+ tqinvalidate();
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::invalidate( )
+void KCHMViewWindow_QTextBrowser::tqinvalidate( )
{
delete m_sourcefactory;
m_sourcefactory = new KCHMSourceFactory (this);
@@ -105,7 +105,7 @@ void KCHMViewWindow_QTextBrowser::invalidate( )
m_searchText = TQString();
reload();
- KCHMViewWindow::invalidate( );
+ KCHMViewWindow::tqinvalidate( );
}
int KCHMViewWindow_QTextBrowser::getScrollbarPosition( )
@@ -159,7 +159,7 @@ bool KCHMViewWindow_QTextBrowser::printCurrentPage( )
do
{
- richText.draw( &p, body.left(), body.top(), view, colorGroup() );
+ richText.draw( &p, body.left(), body.top(), view, tqcolorGroup() );
view.moveBy( 0, body.height() );
p.translate( 0 , -body.height() );
p.drawText( view.right() - p.fontMetrics().width( TQString::number(page) ),
@@ -168,7 +168,7 @@ bool KCHMViewWindow_QTextBrowser::printCurrentPage( )
if ( view.top() >= richText.height() )
break;
- TQString msg = i18n( "Printing (page %1)...") .arg(page);
+ TQString msg = i18n( "Printing (page %1)...") .tqarg(page);
::mainWindow->showInStatusBar( msg );
printer.newPage();
diff --git a/src/kchmviewwindow_qtextbrowser.h b/src/kchmviewwindow_qtextbrowser.h
index 05d7836..9eb3d3a 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 invalidate();
+ virtual void tqinvalidate();
//! Return current ZoomFactor.
virtual int getZoomFactor() const { return m_zoomfactor; }
diff --git a/src/kchmviewwindowmgr.cpp b/src/kchmviewwindowmgr.cpp
index 8b3dad9..4023d7e 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::invalidate()
+void KCHMViewWindowMgr::tqinvalidate()
{
deleteAllWindows();
addNewTab( true );
diff --git a/src/kchmviewwindowmgr.h b/src/kchmviewwindowmgr.h
index a4bdbfe..69a84a4 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 invalidate();
+ void tqinvalidate();
// Creates a Window menu
void createMenu( KCHMMainWindow * parent );
diff --git a/src/kde-qt.h b/src/kde-qt.h
index f0a2244..ac6b5d2 100644
--- a/src/kde-qt.h
+++ b/src/kde-qt.h
@@ -67,8 +67,8 @@
#include <tqsplitter.h>
#include <tqtoolbutton.h>
#include <tqheader.h>
-#include <textbrowser.h>
-#include <layout.h>
+#include <tqtextbrowser.h>
+#include <tqlayout.h>
#include <tqlabel.h>
#include <tqcombobox.h>
#include <tqpushbutton.h>
@@ -76,7 +76,7 @@
/* common utility classes */
#include <tqwhatsthis.h>
#include <tqstring.h>
-#include <textedit.h>
+#include <tqtextedit.h>
#include <tqfile.h>
#include <tqdir.h>
#include <tqregexp.h>
@@ -129,7 +129,7 @@ public:
#include <tqinputdialog.h>
#include <tqcheckbox.h>
-#include <textedit.h>
+#include <tqtextedit.h>
#include <tqradiobutton.h>
#include <tqspinbox.h>
#include <tqgroupbox.h>
diff --git a/src/kde/kchmviewwindow_khtmlpart.cpp b/src/kde/kchmviewwindow_khtmlpart.cpp
index ebf1209..d6cb639 100644
--- a/src/kde/kchmviewwindow_khtmlpart.cpp
+++ b/src/kde/kchmviewwindow_khtmlpart.cpp
@@ -19,7 +19,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <khtmlview.h>
#include <kfinddialog.h>
@@ -44,7 +44,7 @@ KCHMViewWindow_KHTMLPart::KCHMViewWindow_KHTMLPart( TQTabWidget * parent )
m_currentEncoding = 0;
m_searchForward = true;
- invalidate();
+ tqinvalidate();
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::invalidate( )
+void KCHMViewWindow_KHTMLPart::tqinvalidate( )
{
m_zoomfactor = 0;
m_searchForward = true;
@@ -92,7 +92,7 @@ void KCHMViewWindow_KHTMLPart::invalidate( )
setMetaRefreshEnabled ( appConfig.m_kdeEnableRefresh );
setPluginsEnabled ( appConfig.m_kdeEnablePlugins );
- KCHMViewWindow::invalidate( );
+ KCHMViewWindow::tqinvalidate( );
}
int KCHMViewWindow_KHTMLPart::getScrollbarPosition( )
@@ -152,7 +152,7 @@ void KCHMViewWindow_KHTMLPart::clipCopy()
TQString text = selectedText();
if ( !text.isEmpty() )
- TQApplication::clipboard()->setText( text );
+ TQApplication::tqclipboard()->setText( text );
}
void KCHMViewWindow_KHTMLPart::onPopupMenu ( const TQString &url, const TQPoint & point )
diff --git a/src/kde/kchmviewwindow_khtmlpart.h b/src/kde/kchmviewwindow_khtmlpart.h
index 76d4774..178b103 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 invalidate();
+ virtual void tqinvalidate();
//! Return current ZoomFactor.
virtual int getZoomFactor() const { return m_zoomfactor; }