diff options
| author | 2008-09-25 20:29:42 +0000 | |
|---|---|---|
| committer | 2008-09-25 20:29:42 +0000 | |
| commit | e5bee4d31b2c198c6c5f33fe6046425c84b067c9 (patch) | |
| tree | c16a5167a49f96d519b7ea1466d66c835e951124 /src/modules | |
| parent | update win projects + some compilation fixes (diff) | |
| download | KVIrc-e5bee4d31b2c198c6c5f33fe6046425c84b067c9.tar.gz KVIrc-e5bee4d31b2c198c6c5f33fe6046425c84b067c9.tar.bz2 KVIrc-e5bee4d31b2c198c6c5f33fe6046425c84b067c9.zip | |
removed some old references to qt3
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2571 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/dcc/canvaswidget.cpp | 2 | ||||
| -rw-r--r-- | src/modules/dcc/canvaswidget.h | 7 | ||||
| -rw-r--r-- | src/modules/help/helpwindow.cpp | 4 | ||||
| -rw-r--r-- | src/modules/notifier/notifierwindowbody.cpp | 8 | ||||
| -rw-r--r-- | src/modules/notifier/notifierwindowbody.h | 24 | ||||
| -rw-r--r-- | src/modules/objects/class_multilineedit.cpp | 3 | ||||
| -rw-r--r-- | src/modules/theme/packthemedialog.h | 1 |
7 files changed, 3 insertions, 46 deletions
diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp index 38633fbb8..d99a8eedb 100644 --- a/src/modules/dcc/canvaswidget.cpp +++ b/src/modules/dcc/canvaswidget.cpp @@ -31,7 +31,7 @@ #include <QCursor> #include <QPainter> - #include <q3simplerichtext.h> + #include <QTextDocument> #include <QLineEdit> #include <QComboBox> #include <QValidator> diff --git a/src/modules/dcc/canvaswidget.h b/src/modules/dcc/canvaswidget.h index f6045c792..a24f6fe0c 100644 --- a/src/modules/dcc/canvaswidget.h +++ b/src/modules/dcc/canvaswidget.h @@ -28,12 +28,6 @@ #ifdef COMPILE_DCC_CANVAS #include <QCanvas> - - //#ifdef QT_NO_CANVAS - // #warning "Here is not" - //#endif - - #include <QMenuBar> #include <QLabel> #include <QMap> @@ -256,7 +250,6 @@ }; - // For Qt3.0 this might need to be changed class KviVariantTableItem : public QTableItem { public: diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp index 0c5250c42..dfcebeeb1 100644 --- a/src/modules/help/helpwindow.cpp +++ b/src/modules/help/helpwindow.cpp @@ -244,10 +244,9 @@ void KviHelpWindow::showIndexTopic() void KviHelpWindow::searchInIndex( const QString &s ) { - QListWidgetItem *item ;//= m_pIndexListWidget->firstItem(); + QListWidgetItem *item ; QString sl = s.toLower(); for(int i=0;i<m_pIndexListWidget->count();i++) -// while ( i ) { { item=m_pIndexListWidget->item(i); QString t = item->text(); @@ -257,7 +256,6 @@ void KviHelpWindow::searchInIndex( const QString &s ) m_pIndexListWidget->scrollToItem(item,QAbstractItemView::PositionAtTop); break; } - // i = i->next(); } } diff --git a/src/modules/notifier/notifierwindowbody.cpp b/src/modules/notifier/notifierwindowbody.cpp index dc17f1263..f14e7ccc7 100644 --- a/src/modules/notifier/notifierwindowbody.cpp +++ b/src/modules/notifier/notifierwindowbody.cpp @@ -30,14 +30,6 @@ #include <QColor> #include <QPainter> -/* -#ifdef QT3_SUPPORT - #include <Q3Painter> -#else - #include <qpainter.h> -#endif -*/ - KviNotifierWindowBody::KviNotifierWindowBody(QRect r) { loadImages(); diff --git a/src/modules/notifier/notifierwindowbody.h b/src/modules/notifier/notifierwindowbody.h index 93e8b16b3..fd2551613 100644 --- a/src/modules/notifier/notifierwindowbody.h +++ b/src/modules/notifier/notifierwindowbody.h @@ -34,22 +34,11 @@ class QPainter; -/* -#ifdef QT3_SUPPORT - #define QPainter Q3Painter -#endif -*/ - - class KviNotifierWindowBody { public: KviNotifierWindowBody(QRect r); ~KviNotifierWindowBody(); - -// ================================ -// Put members declaration below... -// ================================ private: QRect m_rct; QPoint m_pnt; @@ -91,18 +80,8 @@ private: int m_prevIconState; int m_nextIconState; int m_writeIconState; - -public: - -protected: - - -// ================================ -// Put methods declaration below... -// ================================ private: void loadImages(); - public: void setWidth(int w); void setHeight(int h); @@ -139,9 +118,6 @@ public: void mouseMoveEvent(QMouseEvent * e); void mousePressEvent(QMouseEvent * e); void mouseReleaseEvent(QMouseEvent * e); - -protected: - }; #endif //!_KVINOTIFIERWINDOWBODY_H_ diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp index c6ca43950..e924d5e7b 100644 --- a/src/modules/objects/class_multilineedit.cpp +++ b/src/modules/objects/class_multilineedit.cpp @@ -1139,8 +1139,7 @@ bool KviKvsObject_textedit::functionloadFile(KviKvsObjectFunctionCall * c) QTextStream ts( &file ); QString txt = ts.readAll(); - //if ( !Q3StyleSheet::mightBeRichText( txt ) ) - //txt = Q3StyleSheet::convertFromPlainText( txt, Q3StyleSheetItem::WhiteSpacePre ); + //settext tries to understand if the text is html or plain ((QTextEdit *)widget())->setText( txt ); file.close(); diff --git a/src/modules/theme/packthemedialog.h b/src/modules/theme/packthemedialog.h index 5e998692d..f61f8ab93 100644 --- a/src/modules/theme/packthemedialog.h +++ b/src/modules/theme/packthemedialog.h @@ -33,7 +33,6 @@ class QLineEdit; class QLabel; -//class Q3MultiLineEdit; class KviTalTextEdit; class KviFileSelector; |
