diff options
| author | 2007-03-06 02:37:37 +0000 | |
|---|---|---|
| committer | 2007-03-06 02:37:37 +0000 | |
| commit | af73251aa2b0dc2107ca867e2f4688193d01dbe4 (patch) | |
| tree | a0447183a2d4bfa1aced2798a281c649efd0e63d /src | |
| parent | compile fix (diff) | |
| download | KVIrc-af73251aa2b0dc2107ca867e2f4688193d01dbe4.tar.gz KVIrc-af73251aa2b0dc2107ca867e2f4688193d01dbe4.tar.bz2 KVIrc-af73251aa2b0dc2107ca867e2f4688193d01dbe4.zip | |
Icons and some Qt4 fixes
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@410 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvi_configstatus.h | 6 | ||||
| -rw-r--r-- | src/kvirc/ui/kvi_maskeditor.cpp | 2 | ||||
| -rw-r--r-- | src/kvirc/ui/kvi_maskeditor.h | 2 | ||||
| -rw-r--r-- | src/modules/about_vc05.ncb | 2 | ||||
| -rw-r--r-- | src/modules/about_vc05.ncbabout_vc05.ncb | 2 | ||||
| -rwxr-xr-x | src/modules/help/index.cpp | 48 | ||||
| -rw-r--r-- | src/modules/iograph/libkviiograph.cpp | 5 | ||||
| -rw-r--r-- | src/modules/list/listwindow.cpp | 24 | ||||
| -rw-r--r-- | src/modules/my/idle_x11.cpp | 8 | ||||
| -rw-r--r-- | src/modules/options/dialog.cpp | 120 | ||||
| -rw-r--r-- | src/modules/options/optw_texticons.h | 2 | ||||
| -rw-r--r-- | src/modules/system/libkvisystem.cpp | 13 | ||||
| -rw-r--r-- | src/modules/toolbareditor/toolbareditor.cpp | 8 |
13 files changed, 100 insertions, 142 deletions
diff --git a/src/kvi_configstatus.h b/src/kvi_configstatus.h index 84b1cc4d2..9a649bdc6 100644 --- a/src/kvi_configstatus.h +++ b/src/kvi_configstatus.h @@ -8,10 +8,10 @@ /* #undef BIG_ENDIAN_MACHINE_BYTE_ORDER */ /* this is the build date (configure date rather) */ -#define BUILD_DATE "Tue Feb 20 03:20:49 UTC 2007" +#define BUILD_DATE "Tue Mar 6 01:35:06 UTC 2007" /* these are the build flags */ -#define BUILD_FLAGS "x86_64-cefgikopsAGTZ" +#define BUILD_FLAGS "x86_64-cfgikopsAGTZ" /* define if you want to enable the Arts daemon support */ /* #undef COMPILE_ARTS_SUPPORT */ @@ -26,7 +26,7 @@ /* #undef COMPILE_DISABLE_DCC_VOICE */ /* define if you want to enable the Esound daemon support */ -#define COMPILE_ESD_SUPPORT 1 +/* #undef COMPILE_ESD_SUPPORT */ /* define if you have the SIOCGIFADDR ioctl and the related headers */ #define COMPILE_GET_INTERFACE_ADDRESS 1 diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp index 9ab321924..07dd6eec7 100644 --- a/src/kvirc/ui/kvi_maskeditor.cpp +++ b/src/kvirc/ui/kvi_maskeditor.cpp @@ -49,7 +49,7 @@ KviMaskItem::KviMaskItem(KviTalListView* parent,KviMaskEntry* entry) KviMaskItem::~KviMaskItem() { } -#ifdef COMPILE_QT4_SUPPORT +#ifdef COMPILE_USE_QT4 int KviMaskItem::compare ( KviTalListViewItem * i, int col, bool ascending ) const #else int KviMaskItem::compare ( QListViewItem * i, int col, bool ascending ) const diff --git a/src/kvirc/ui/kvi_maskeditor.h b/src/kvirc/ui/kvi_maskeditor.h index f74ccbfaf..d86a94fca 100644 --- a/src/kvirc/ui/kvi_maskeditor.h +++ b/src/kvirc/ui/kvi_maskeditor.h @@ -51,7 +51,7 @@ public: ~KviMaskItem(); KviMaskEntry* mask() { return &m_Mask; }; -#ifdef COMPILE_QT4_SUPPORT +#ifdef COMPILE_USE_QT4 virtual int compare ( KviTalListViewItem * i, int col, bool ascending ) const; #else virtual int compare ( QListViewItem * i, int col, bool ascending ) const; diff --git a/src/modules/about_vc05.ncb b/src/modules/about_vc05.ncb deleted file mode 100644 index 34a437dac..000000000 --- a/src/modules/about_vc05.ncb +++ /dev/null @@ -1,2 +0,0 @@ -Microsoft C/C++ MSF 7.00
- DS diff --git a/src/modules/about_vc05.ncbabout_vc05.ncb b/src/modules/about_vc05.ncbabout_vc05.ncb deleted file mode 100644 index 34a437dac..000000000 --- a/src/modules/about_vc05.ncbabout_vc05.ncb +++ /dev/null @@ -1,2 +0,0 @@ -Microsoft C/C++ MSF 7.00
- DS diff --git a/src/modules/help/index.cpp b/src/modules/help/index.cpp index d4ca466d9..540273d0e 100755 --- a/src/modules/help/index.cpp +++ b/src/modules/help/index.cpp @@ -54,7 +54,7 @@ -#include <qfile.h> +#include "kvi_file.h" #include <qdir.h> @@ -64,7 +64,7 @@ #include <qapplication.h> - +#include <qtextstream.h> #include <ctype.h> @@ -265,8 +265,8 @@ void Index::insertInDict( const QString &str, int docNum ) void Index::parseDocument( const QString &filename, int docNum ) { - QFile file( filename ); - if ( !file.open( IO_ReadOnly ) ) { + KviFile file( filename ); + if ( !file.openForReading() ) { qWarning( "can not open file " + filename ); return; } @@ -339,9 +339,9 @@ void Index::writeDict() KviDictIterator<Entry> it( dict ); - QFile f( dictFile ); + KviFile f( dictFile ); - if ( !f.open( IO_WriteOnly | IO_Truncate ) ) + if ( !f.openForWriting() ) return; @@ -368,15 +368,15 @@ void Index::writeDict() void Index::writeDocumentList() { - QFile f( docListFile ); - if ( !f.open( IO_WriteOnly | IO_Truncate ) ) + KviFile f( docListFile ); + if ( !f.openForWriting() ) return; QTextStream s( &f ); QString docs = docList.join("[#item#]"); s << docs; - QFile f1( docListFile+".titles" ); - if ( !f1.open( IO_WriteOnly | IO_Truncate ) ) + KviFile f1( docListFile+".titles" ); + if ( !f1.openForWriting() ) return; QTextStream s1( &f1 ); docs = titleList.join("[#item#]"); @@ -388,8 +388,8 @@ void Index::writeDocumentList() void Index::readDict() { - QFile f( dictFile ); - if ( !f.open( IO_ReadOnly ) ) + KviFile f( dictFile ); + if ( !f.openForReading() ) return; dict.clear(); QDataStream s( &f ); @@ -409,15 +409,15 @@ void Index::readDict() void Index::readDocumentList() { //reading docs - QFile f( docListFile ); - if ( !f.open( IO_ReadOnly ) ) + KviFile f( docListFile ); + if ( !f.openForReading() ) return; QTextStream s( &f ); docList = QStringList::split("[#item#]",s.read()); //reading titles - QFile f1( docListFile+".titles" ); - if ( !f1.open( IO_ReadOnly ) ) + KviFile f1( docListFile+".titles" ); + if ( !f1.openForReading() ) return; QTextStream s1( &f1 ); titleList = QStringList::split("[#item#]",s1.read()); @@ -522,8 +522,9 @@ QStringList Index::query( const QStringList &terms, const QStringList &termSeq, QStringList results; +#ifndef COMPILE_USE_QT4 qHeapSort( minDocs ); - +#endif if ( termSeq.isEmpty() ) { for ( C = minDocs.begin(); C != minDocs.end(); ++C ) @@ -558,9 +559,9 @@ QString Index::getDocumentTitle( const QString &fileName ) { - QFile file( fileName ); + KviFile file( fileName ); - if ( !file.open( IO_ReadOnly ) ) { + if ( !file.openForReading() ) { qWarning( "cannot open file " + fileName ); @@ -596,8 +597,11 @@ QStringList Index::getWildcardTerms( const QString &term ) QStringList terms = split( term ); +#ifdef COMPILE_USE_QT4 + QStringList::Iterator iter; +#else KviValueList<QString>::iterator iter; - +#endif KviDictIterator<Entry> it( dict ); @@ -804,9 +808,9 @@ bool Index::searchForPattern( const QStringList &patterns, const QStringList &wo { - QFile file( fileName ); + KviFile file( fileName ); - if ( !file.open( IO_ReadOnly ) ) { + if ( !file.openForReading() ) { qWarning( "cannot open file " + fileName ); diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp index 6b889d424..2ad73a410 100644 --- a/src/modules/iograph/libkviiograph.cpp +++ b/src/modules/iograph/libkviiograph.cpp @@ -20,9 +20,13 @@ // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // + #include "libkviiograph.h" #include "kvi_module.h" +#if 0 + + #include "kvi_console.h" #include "kvi_options.h" #include "kvi_ircsocket.h" @@ -34,7 +38,6 @@ #include <qpointarray.h> #include <qpainter.h> -#if 0 extern QPixmap * g_pIccMemBuffer; diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp index 3339b06e9..a4b23510c 100644 --- a/src/modules/list/listwindow.cpp +++ b/src/modules/list/listwindow.cpp @@ -38,6 +38,7 @@ #include "kvi_ircconnection.h" #include "kvi_ircconnection.h" #include "kvi_qstring.h" +#include "kvi_qcstring.h" #include "kvi_topicw.h" #include "kvi_config.h" #include "kvi_filedialog.h" @@ -48,6 +49,7 @@ #include <qfontmetrics.h> #include <qsplitter.h> #include <qtooltip.h> +#include <qdatetime.h> #include "kvi_tal_hbox.h" #include "kvi_msgbox.h" @@ -120,11 +122,15 @@ void KviChannelListViewItem::paintCell(QPainter * p,const QColorGroup &cg,int co KviTalListView* lv = (KviTalListView *)listView(); int marg = lv->itemMargin(); int r = marg; - - const BackgroundMode bgmode = lv->viewport()->backgroundMode(); - const QColorGroup::ColorRole crole = QPalette::backgroundRoleFromMode( bgmode ); + +#ifdef COMPILE_USE_QT4 + + p->fillRect( 0, 0, width, height(), cg.brush(lv->viewport()->backgroundRole()) ); +#else + const QColorGroup::ColorRole crole = QPalette::backgroundRoleFromMode(lv->viewport()->backgroundMode()); p->fillRect( 0, 0, width, height(), cg.brush( crole ) ); +#endif if ( isSelected() && (column == 0 || lv->allColumnsShowFocus()) ) { @@ -175,9 +181,9 @@ KviListWindow::KviListWindow(KviFrame * lpFrm,KviConsole * lpConsole) m_pItemList = new KviPtrList<KviChannelListViewItemData>; m_pItemList->setAutoDelete(false); - m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"splitter"); - m_pTopSplitter = new QSplitter(QSplitter::Horizontal,this,"top_splitter"); - m_pVertSplitter = new QSplitter(QSplitter::Vertical,m_pSplitter,"vsplitter"); + m_pSplitter = new QSplitter(Qt::Horizontal,this,"splitter"); + m_pTopSplitter = new QSplitter(Qt::Horizontal,this,"top_splitter"); + m_pVertSplitter = new QSplitter(Qt::Vertical,m_pSplitter,"vsplitter"); KviTalHBox * box = new KviTalHBox(m_pTopSplitter); m_pOpenButton = new KviStyledToolButton(box); @@ -214,8 +220,8 @@ KviListWindow::KviListWindow(KviFrame * lpFrm,KviConsole * lpConsole) m_pListView->addColumn(__tr2qs("Users")); m_pListView->addColumn(__tr2qs("Topic")); m_pListView->setAllColumnsShowFocus(TRUE); - m_pListView->setColumnWidthMode(2,QListView::Maximum); - m_pListView->setColumnWidthMode(3,QListView::Maximum); + m_pListView->setColumnWidthMode(2,KviTalListView::Maximum); + m_pListView->setColumnWidthMode(3,KviTalListView::Maximum); m_pListView->setSorting(100); connect(m_pListView,SIGNAL(doubleClicked(KviTalListViewItem *)),this,SLOT(itemDoubleClicked(KviTalListViewItem *))); @@ -483,7 +489,7 @@ void KviListWindow::itemDoubleClicked(KviTalListViewItem *it) QString sz = ((KviChannelListViewItem *)it)->channel(); if(sz.isEmpty())return; if(!connection())return; - QCString dat = connection()->encodeText(sz); + KviQCString dat = connection()->encodeText(sz); if(!dat.data())return; m_pConsole->connection()->sendFmtData("join %s",dat.data()); } diff --git a/src/modules/my/idle_x11.cpp b/src/modules/my/idle_x11.cpp index 95d27fb1f..cd794f827 100644 --- a/src/modules/my/idle_x11.cpp +++ b/src/modules/my/idle_x11.cpp @@ -90,11 +90,19 @@ bool IdlePlatform::init() return false; } +#ifdef COMPILE_USE_QT4 + #include <qx11info_x11.h> +#endif + int IdlePlatform::secondsIdle() { if(!d->ss_info) return 0; +#ifdef COMPILE_USE_QT4 + if(!XScreenSaverQueryInfo(QApplication::desktop()->screen()->x11Display(), QX11Info::appRootWindow(), d->ss_info)) +#else if(!XScreenSaverQueryInfo(QApplication::desktop()->screen()->x11Display(), qt_xrootwin(), d->ss_info)) +#endif return 0; return d->ss_info->idle / 1000; } diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index 984c84db8..ed0befe44 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -42,18 +42,15 @@ #include "kvi_tal_tooltip.h" #ifdef COMPILE_USE_QT4 -#include <Q3Header> + #include <q3header.h> #else -#include <qheader.h> + #include <qheader.h> + #include <qobjectlist.h> #endif #include "kvi_tal_popupmenu.h" #include <qtoolbutton.h> #include <qcheckbox.h> #include <kvi_tal_groupbox.h> -#ifndef COMPILE_USE_QT4 -#include <qobjectlist.h> - -#endif #include <qpainter.h> #include <qfont.h> #include <qevent.h> @@ -189,11 +186,7 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup) setCaption(szCaption); QGridLayout * g1 = new QGridLayout(this,2,5,8,8); - #ifdef COMPILE_USE_QT4 - QSplitter * spl = new QSplitter(Qt::Horizontal,this,"main_splitter"); - #else - QSplitter * spl = new QSplitter(QSplitter::Horizontal,this); -#endif + QSplitter * spl = new QSplitter(Qt::Horizontal,this); g1->addMultiCellWidget(spl,0,0,0,4); @@ -329,105 +322,45 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const QStr KviPtrDict<bool> lOptionWidgetsToMark; lOptionWidgetsToMark.setAutoDelete(true); QTabWidget * pTabWidgetToMark = 0; + + QObject * o; #ifdef COMPILE_USE_QT4 - QObjectList ol = pItem->m_pOptionsWidget->queryList(); - if(!ol.empty()) + QObjectList ol = pItem->m_pOptionsWidget->queryList(); + if(ol.count() > 0) + { + for(QObjectList::Iterator it = ol.begin();it != ol.end();++it) + { + o = *it; #else - QObjectList *ol = pItem->m_pOptionsWidget->queryList(); + QObjectList * ol = pItem->m_pOptionsWidget->queryList(); if(ol) -#endif { - QObject * o; -#ifndef COMPILE_USE_QT4 QObjectListIt it(*ol); while((o = it.current())/* && (!bFoundSomethingHere)*/) { -#else - for(int i=0;i<ol.count();i++) - { - o=ol.at(i); #endif - QString szText; if(o->inherits("QLabel"))szText = ((QLabel *)o)->text(); else if(o->inherits("QCheckBox"))szText = ((QCheckBox *)o)->text(); else if(o->inherits("KviTalGroupBox"))szText = ((KviTalGroupBox *)o)->title(); #ifdef COMPILE_INFO_TIPS - if(o->inherits("QWidget")){ - szText.append(KviTalToolTip::textFor((QWidget*)o)); - } -#endif + if(o->inherits("QWidget")) #ifdef COMPILE_USE_QT4 - + szText.append(((QWidget *)o)->toolTip()); +#else + szText.append(QToolTip::textFor((QWidget*)o)); +#endif +#endif if(!szText.isEmpty()) { bool bOk = true; - for(int j=0;j<lKeywords.count();i++) + for(int j=0;j<lKeywords.count();j++) { +#ifdef COMPILE_USE_QT4 if(szText.find(lKeywords.at(j),0,false) == -1) - { - bOk = false; - break; - } - } - if(bOk) - { - bFoundSomethingHere = true; - } - - if(o->inherits("QWidget")) - { - QWidget* pWidget=(QWidget*)o; - QFont font = pWidget->font(); - font.setBold(bOk); - font.setUnderline(bOk); - pWidget->setFont(font); - - // if there is a QTabWidget in the parent chain, signal it in the tab text - QObject * pParent = pWidget->parent(); - while(pParent) - { - if(pParent->inherits("QTabWidget")) - { - pTabWidgetToMark = (QTabWidget *)pParent; - break; - } - pParent = pParent->parent(); - } - - if(pTabWidgetToMark) - { - // lookup the KviOptionsWidget parent - pParent = pWidget->parent(); - while(pParent) - { - if(pParent->inherits("KviOptionsWidget")) - { - bool * pExistingBool = lOptionWidgetsToMark.find(pParent); - if(pExistingBool) - { - if(bOk) - *pExistingBool = true; - } else { - lOptionWidgetsToMark.insert(pParent,new bool(bOk)); - } - break; - } - pParent = pParent->parent(); - } - } - } - } - - } - #else - if(!szText) - { - bool bOk = true; - for(QStringList::ConstIterator it = lKeywords.begin();it != lKeywords.end();++it) - { - if(szText.find(*it,0,false) == -1) + if(szText.find(*(lKeywords.at(j)),0,false) == -1) +#endif { bOk = false; break; @@ -481,11 +414,14 @@ bool KviOptionsDialog::recursiveSearch(KviOptionsListViewItem * pItem,const QStr } } } - + +#ifndef COMPILE_USE_QT4 ++it; +#endif } +#ifndef COMPILE_USE_QT4 delete ol; - #endif +#endif } if(pTabWidgetToMark) diff --git a/src/modules/options/optw_texticons.h b/src/modules/options/optw_texticons.h index a929e2607..d1e275523 100644 --- a/src/modules/options/optw_texticons.h +++ b/src/modules/options/optw_texticons.h @@ -37,7 +37,7 @@ #include "kvi_tal_hbox.h" #ifdef COMPILE_USE_QT4 -#include <Q3Table> +#include <q3table.h> #define KviTalTable Q3Table #define KviTalTableItem Q3TableItem #else diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp index 56e0bbd3c..759f852e3 100644 --- a/src/modules/system/libkvisystem.cpp +++ b/src/modules/system/libkvisystem.cpp @@ -31,6 +31,7 @@ #include "kvi_app.h" #include "kvi_env.h" #include "kvi_osinfo.h" +#include "kvi_qcstring.h" #include <qclipboard.h> @@ -417,7 +418,7 @@ static bool system_kvs_fnc_hostname(KviKvsModuleFunctionCall *c) The parameters MUST be in the form "type=value" where "type" is the C++ type of the parameter and value is the string rappresentation of the parameter data. Currently - KVIrc supports only QString,QCString,bool,int and uint data types.[br] + KVIrc supports only QString,KviQCString,bool,int and uint data types.[br] The returned value is the string rappresentation of the returned data if the return type is known, otherwise it is the name of the data type returned. [br] @@ -493,9 +494,9 @@ static bool system_kvs_fnc_dcop(KviKvsModuleFunctionCall *c) { QString ddd = tmp.ptr(); ds << ddd; - } else if(kvi_strEqualCI("QCString",szType.ptr())) + } else if(kvi_strEqualCI("KviQCString",szType.ptr())) { - QCString qcs = tmp.ptr(); + KviQCString qcs = tmp.ptr(); ds << qcs; } else if(kvi_strEqualCI("bool",szType.ptr())) { @@ -517,7 +518,7 @@ static bool system_kvs_fnc_dcop(KviKvsModuleFunctionCall *c) } QByteArray rba; - QCString szRetType; + KviQCString szRetType; bool bRet = g_pApp->dcopClient()->call(szApp,szObj,szFun,ba,szRetType,rba); @@ -543,7 +544,7 @@ static bool system_kvs_fnc_dcop(KviKvsModuleFunctionCall *c) c->returnValue()->setString(szz); } else if(szRetType == "QCString") { - QCString sss; + KviQCString sss; ret >> sss; c->returnValue()->setString(sss.data()); } else if((szRetType == "uint") || (szRetType == "unsigned int") || (szRetType == "Q_UINT32")) @@ -558,6 +559,7 @@ static bool system_kvs_fnc_dcop(KviKvsModuleFunctionCall *c) c->returnValue()->setInteger(iii); } else if(szRetType == "QCStringList") { +#ifndef COMPILE_USE_QT4 QCStringList csl; ret >> csl; KviKvsArray * arry = new KviKvsArray(); @@ -568,6 +570,7 @@ static bool system_kvs_fnc_dcop(KviKvsModuleFunctionCall *c) idx++; } c->returnValue()->setArray(arry); +#endif } else if(szRetType == "QStringList") { QStringList csl; diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp index b979f9b8a..8cb4a64cd 100644 --- a/src/modules/toolbareditor/toolbareditor.cpp +++ b/src/modules/toolbareditor/toolbareditor.cpp @@ -34,18 +34,20 @@ #include "kvi_fileutils.h" #include "kvi_filedialog.h" #include "kvi_kvs_useraction.h" +#include "kvi_draganddrop.h" #include <qpushbutton.h> #include <qlayout.h> #include <qapplication.h> #include <qtooltip.h> -#include <qdragobject.h> + #include <qlineedit.h> #include <qlabel.h> #include <qmessagebox.h> #include <qframe.h> #include <qdir.h> #include <qtimer.h> +#include <qevent.h> KviCustomizeToolBarsDialog * KviCustomizeToolBarsDialog::m_pInstance = 0; extern QRect g_rectToolBarEditorDialogGeometry; @@ -103,14 +105,14 @@ void KviTrashcanLabel::heartbeat() void KviTrashcanLabel::dropEvent(QDropEvent * e) { - if(QTextDrag::canDecode(e)) + if(KviTextDrag::canDecode(e)) e->accept(); } void KviTrashcanLabel::dragEnterEvent(QDragEnterEvent * e) { QString s; - if(QTextDrag::decode(e,s)) + if(KviTextDrag::decode(e,s)) e->accept(); } |
