diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-08-24 21:28:39 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-08-31 16:31:47 +0900 |
commit | 7c3b44b81086c6b99f91e294c3b438dc808b47e2 (patch) | |
tree | d92d61649487df1a2fbd200d4ead11a7f16ba63f /src/modules/help | |
parent | cafbffba66b6ce809783ed1eb4d24aac6fe9701f (diff) | |
download | kvirc-7c3b44b81086c6b99f91e294c3b438dc808b47e2.tar.gz kvirc-7c3b44b81086c6b99f91e294c3b438dc808b47e2.zip |
Drop USE_QT4 code
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 030a2248f3630fd0404df98beffc78b5b5ca4c31)
Diffstat (limited to 'src/modules/help')
-rw-r--r-- | src/modules/help/helpwidget.cpp | 6 | ||||
-rw-r--r-- | src/modules/help/helpwindow.cpp | 20 | ||||
-rw-r--r-- | src/modules/help/index.cpp | 6 | ||||
-rw-r--r-- | src/modules/help/libkvihelp.cpp | 7 |
4 files changed, 0 insertions, 39 deletions
diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp index 96a7edb9..67c0793d 100644 --- a/src/modules/help/helpwidget.cpp +++ b/src/modules/help/helpwidget.cpp @@ -52,9 +52,7 @@ KviHelpWidget::KviHelpWidget(TQWidget * par,KviFrame * lpFrm,bool bIsStandalone) //#warning "Re enable this when using TQt 3.0 : TQProcess " m_pTextBrowser = new TQTextBrowser(this,"text_browser"); m_pTextBrowser->setFrameStyle(TQFrame::StyledPanel|TQFrame::Sunken); -#ifndef COMPILE_USE_QT4 m_pTextBrowser->setFocusPolicy(TQ_NoFocus); -#endif m_pToolBar = new KviTalHBox(this); m_pBtnIndex = new KviStyledToolButton(m_pToolBar); @@ -99,11 +97,7 @@ KviHelpWidget::~KviHelpWidget() void KviHelpWidget::showIndex() { -#ifdef COMPILE_USE_QT4 - m_pTextBrowser->setSource(TQUrl("index.html")); -#else m_pTextBrowser->setSource("index.html"); -#endif } void KviHelpWidget::resizeEvent(TQResizeEvent *e) diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp index 1be7f5e8..fbeb1abf 100644 --- a/src/modules/help/helpwindow.cpp +++ b/src/modules/help/helpwindow.cpp @@ -61,11 +61,7 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name) if ( TQFileInfo( szDoclist ).exists() && TQFileInfo( szDict ).exists() ) { g_pDocIndex->readDict(); } else { -#ifdef COMPILE_USE_QT4 - TQProgressDialog* pProgressDialog = new TQProgressDialog( __tr2qs("Indexing help files"), __tr2qs("Cancel"), 0,100 ); -#else TQProgressDialog* pProgressDialog = new TQProgressDialog( __tr2qs("Indexing help files"), __tr2qs("Cancel"), 100 ); -#endif connect(g_pDocIndex,TQT_SIGNAL(indexingProgress(int)), pProgressDialog, TQT_SLOT(setProgress(int)) ); g_pDocIndex->makeIndex(); g_pDocIndex->writeDict(); @@ -148,11 +144,7 @@ void KviHelpWindow::loadProperties(KviConfig *cfg) void KviHelpWindow::refreshIndex() { m_pIndexListBox->clear(); -#ifdef COMPILE_USE_QT4 - TQProgressDialog* pProgressDialog = new TQProgressDialog( __tr2qs("Indexing help files"), __tr2qs("Cancel"), 0,100 ); -#else TQProgressDialog* pProgressDialog = new TQProgressDialog( __tr2qs("Indexing help files"), __tr2qs("Cancel"), 100 ); -#endif connect(g_pDocIndex,TQT_SIGNAL(indexingProgress(int)), pProgressDialog, TQT_SLOT(setProgress(int)) ); g_pDocIndex->makeIndex(); g_pDocIndex->writeDict(); @@ -183,11 +175,7 @@ void KviHelpWindow::startSearch() (*it) = (*it).replace( "\"", "" ); } if ( str.contains( '\"' ) ) { -#ifdef COMPILE_USE_QT4 - if ( (str.count( '\"' ))%2 == 0 ) { -#else if ( (str.contains( '\"' ))%2 == 0 ) { -#endif int beg = 0; int end = 0; TQString s; @@ -213,11 +201,7 @@ void KviHelpWindow::startSearch() return; } } -#ifdef COMPILE_USE_QT4 - setCursor( TQt::WaitCursor ); -#else setCursor( waitCursor ); -#endif m_foundDocs.clear(); m_foundDocs = g_pDocIndex->query( m_terms, termSeq, seqWords ); @@ -246,11 +230,7 @@ void KviHelpWindow::startSearch() if ( !s.isEmpty() ) m_terms << s; -#ifdef COMPILE_USE_QT4 - setCursor( TQt::ArrowCursor ); -#else setCursor( arrowCursor ); -#endif } TQTextBrowser * KviHelpWindow::textBrowser() diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp index f63ca0a2..19d7a77c 100644 --- a/src/modules/help/index.cpp +++ b/src/modules/help/index.cpp @@ -411,9 +411,7 @@ TQStringList Index::query( const TQStringList &terms, const TQStringList &termSe TQStringList results; -#ifndef COMPILE_USE_QT4 qHeapSort( minDocs ); -#endif if ( termSeq.isEmpty() ) { for ( C = minDocs.begin(); C != minDocs.end(); ++C ) @@ -486,11 +484,7 @@ TQStringList Index::getWildcardTerms( const TQString &term ) TQStringList terms = split( term ); -#ifdef COMPILE_USE_QT4 - TQStringList::Iterator iter; -#else KviValueList<TQString>::iterator iter; -#endif KviPointerHashTableIterator<TQString,Entry> it( dict ); diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp index e6d4e821..9ad1a07a 100644 --- a/src/modules/help/libkvihelp.cpp +++ b/src/modules/help/libkvihelp.cpp @@ -33,9 +33,6 @@ #include "kvi_frame.h" -#ifdef COMPILE_USE_QT4 - #include <tq3mimefactory.h> -#endif #include <tqsplitter.h> @@ -146,11 +143,7 @@ static bool help_kvs_cmd_open(KviKvsModuleCommandCall * c) KVSM_PARAMETER("document",KVS_PT_STRING,KVS_PF_OPTIONAL,doc) KVSM_PARAMETERS_END(c) if(doc.isEmpty())doc = "index.html"; -#ifdef COMPILE_USE_QT4 - Q3MimeSourceFactory * f = Q3MimeSourceFactory::defaultFactory(); -#else TQMimeSourceFactory * f = TQMimeSourceFactory::defaultFactory(); -#endif if(f) { if(!f->data(doc)) |