diff options
Diffstat (limited to 'src/modules/help/helpwindow.cpp')
| -rw-r--r-- | src/modules/help/helpwindow.cpp | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp index eb40416ac..197e9e811 100644 --- a/src/modules/help/helpwindow.cpp +++ b/src/modules/help/helpwindow.cpp @@ -38,7 +38,7 @@ #include <qmessagebox.h> #include <qregexp.h> #include <qtooltip.h> -#include <qvaluelist.h> +#include "kvi_valuelist.h" extern Index * g_pDocIndex; extern KviPtrList<KviHelpWindow> * g_pHelpWindowList; @@ -59,7 +59,11 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name) if ( QFileInfo( szDoclist ).exists() && QFileInfo( szDict ).exists() ) { g_pDocIndex->readDict(); } else { +#ifdef COMPILE_USE_QT4 + QProgressDialog* pProgressDialog = new QProgressDialog( __tr2qs("Indexing help files"), __tr2qs("Cancel"), 0,100 ); +#else QProgressDialog* pProgressDialog = new QProgressDialog( __tr2qs("Indexing help files"), __tr2qs("Cancel"), 100 ); +#endif connect(g_pDocIndex,SIGNAL(indexingProgress(int)), pProgressDialog, SLOT(setProgress(int)) ); g_pDocIndex->makeIndex(); g_pDocIndex->writeDict(); @@ -70,7 +74,7 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name) } g_pHelpWindowList->append(this); - m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"main_splitter"); + m_pSplitter = new QSplitter(Qt::Horizontal,this,"main_splitter"); m_pHelpWidget = new KviHelpWidget(m_pSplitter,lpFrm); m_pToolBar=new KviTalVBox(m_pSplitter); @@ -110,7 +114,7 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name) m_pResultBox = new KviTalListBox(m_pSearchTab); connect(m_pResultBox,SIGNAL(selected(int)),this,SLOT(searchSelected ( int ))); - QValueList<int> li; + KviValueList<int> li; li.append(width()-80); li.append(80); m_pSplitter->setSizes(li); @@ -130,7 +134,7 @@ void KviHelpWindow::saveProperties(KviConfig *cfg) void KviHelpWindow::loadProperties(KviConfig *cfg) { - QValueList<int> def; + KviValueList<int> def; int w = width(); def.append((w * 82) / 100); def.append((w * 18) / 100); @@ -142,7 +146,11 @@ void KviHelpWindow::loadProperties(KviConfig *cfg) void KviHelpWindow::refreshIndex() { m_pIndexListBox->clear(); +#ifdef COMPILE_USE_QT4 + QProgressDialog* pProgressDialog = new QProgressDialog( __tr2qs("Indexing help files"), __tr2qs("Cancel"), 0,100 ); +#else QProgressDialog* pProgressDialog = new QProgressDialog( __tr2qs("Indexing help files"), __tr2qs("Cancel"), 100 ); +#endif connect(g_pDocIndex,SIGNAL(indexingProgress(int)), pProgressDialog, SLOT(setProgress(int)) ); g_pDocIndex->makeIndex(); g_pDocIndex->writeDict(); @@ -173,7 +181,11 @@ 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; QString s; @@ -199,7 +211,11 @@ void KviHelpWindow::startSearch() return; } } +#ifdef COMPILE_USE_QT4 + setCursor( Qt::WaitCursor ); +#else setCursor( waitCursor ); +#endif m_foundDocs.clear(); m_foundDocs = g_pDocIndex->query( m_terms, termSeq, seqWords ); @@ -228,7 +244,11 @@ void KviHelpWindow::startSearch() if ( !s.isEmpty() ) m_terms << s; +#ifdef COMPILE_USE_QT4 + setCursor( Qt::ArrowCursor ); +#else setCursor( arrowCursor ); +#endif } QTextBrowser * KviHelpWindow::textBrowser() |