diff options
Diffstat (limited to 'src/modules')
36 files changed, 261 insertions, 227 deletions
diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp index db76a44c7..1688e09e2 100644 --- a/src/modules/about/aboutdialog.cpp +++ b/src/modules/about/aboutdialog.cpp @@ -33,9 +33,10 @@ #include <qwidget.h> #include <qlayout.h> -#include <qtextedit.h> +#include <kvi_tal_textedit.h> #include <qlabel.h> #include <qpixmap.h> +#include <qevent.h> extern KviAboutDialog * g_pAboutDialog; /* @@ -69,7 +70,7 @@ extern KviAboutDialog * g_pAboutDialog; #include "abouttext.inc" KviAboutDialog::KviAboutDialog() -: QTabDialog(0) +: KviTalTabDialog(0) { setCaption(__tr2qs_ctx("About KVIrc...","about")); setOkButton(__tr2qs_ctx("Close","about")); @@ -98,7 +99,7 @@ KviAboutDialog::KviAboutDialog() aboutString += KVI_SOURCES_DATE; l = new QLabel(aboutString,w); - l->setAlignment(AlignCenter); + l->setAlignment(Qt::AlignCenter); g->addWidget(l,1,0); addTab(w,__tr2qs_ctx("About","about")); @@ -108,7 +109,7 @@ KviAboutDialog::KviAboutDialog() w = new QWidget(this); g = new QGridLayout(w,1,1,4,8); - QTextEdit * v = new QTextEdit(w); + KviTalTextEdit * v = new KviTalTextEdit(w); v->setReadOnly(true); g->addWidget(v,0,0); @@ -121,9 +122,9 @@ KviAboutDialog::KviAboutDialog() w = new QWidget(this); g = new QGridLayout(w,1,1,4,8); - v = new QTextEdit(w); + v = new KviTalTextEdit(w); v->setReadOnly(true); - v->setWordWrap(QTextEdit::NoWrap); + v->setWordWrap(KviTalTextEdit::NoWrap); g->addWidget(v,0,0); QString szLicense; diff --git a/src/modules/about/aboutdialog.h b/src/modules/about/aboutdialog.h index b33579ab7..95ef968a4 100644 --- a/src/modules/about/aboutdialog.h +++ b/src/modules/about/aboutdialog.h @@ -22,9 +22,9 @@ // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // -#include <qtabdialog.h> +#include <kvi_tal_tabdialog.h> -class KviAboutDialog : public QTabDialog +class KviAboutDialog : public KviTalTabDialog { Q_OBJECT public: diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp index 0bde7db8a..0c3e787ed 100644 --- a/src/modules/actioneditor/actioneditor.cpp +++ b/src/modules/actioneditor/actioneditor.cpp @@ -23,7 +23,6 @@ //============================================================================= #include "actioneditor.h" -#include "kvi_styled_controls.h" #include "kvi_iconmanager.h" #include "kvi_options.h" #include "kvi_locale.h" @@ -54,12 +53,15 @@ #include <qtoolbutton.h> #include <qcheckbox.h> #include <qtooltip.h> -#include <qsimplerichtext.h> #include <qpainter.h> -#include <qheader.h> +#ifdef COMPILE_USE_QT4 + #include <q3header.h> +#else + #include <qheader.h> +#endif #include <qtabwidget.h> #include <kvi_tal_groupbox.h> -#include <qvaluelist.h> +#include "kvi_valuelist.h" #include <qlabel.h> extern KviActionEditorWindow * g_pActionEditorWindow; @@ -652,7 +654,11 @@ KviActionEditor::KviActionEditor(QWidget * par) QGridLayout * l = new QGridLayout(this,1,1,2,2); +#ifdef COMPILE_USE_QT4 + m_pSplitter = new QSplitter(Qt::Horizontal,this); +#else m_pSplitter = new QSplitter(QSplitter::Horizontal,this); +#endif l->addWidget(m_pSplitter,0,0); @@ -661,7 +667,11 @@ KviActionEditor::KviActionEditor(QWidget * par) m_pListView = new KviActionEditorListView(box); //m_pListView->setMultiSelection(false); m_pListView->setShowSortIndicator(true); +#ifdef COMPILE_USE_QT4 + m_pListView->setFocusPolicy(Qt::StrongFocus); +#else m_pListView->setFocusPolicy(QWidget::StrongFocus); +#endif connect(m_pListView,SIGNAL(currentChanged(KviTalListViewItem *)),this,SLOT(currentChanged(KviTalListViewItem *))); @@ -990,7 +1000,7 @@ void KviActionEditorWindow::loadProperties(KviConfig *cfg) { int w = width(); KviWindow::loadProperties(cfg); - QValueList<int> def; + KviValueList<int> def; def.append((w * 25) / 100); def.append((w * 75) / 100); m_pEditor->m_pSplitter->setSizes(cfg->readIntListEntry("Splitter",def)); diff --git a/src/modules/actioneditor/actioneditor.h b/src/modules/actioneditor/actioneditor.h index bd6cf38c4..e62df5565 100644 --- a/src/modules/actioneditor/actioneditor.h +++ b/src/modules/actioneditor/actioneditor.h @@ -28,6 +28,7 @@ #include <qwidget.h> #include "kvi_tal_listview.h" +#include "kvi_styled_controls.h" class KviActionEditorListViewItem; @@ -67,10 +68,18 @@ class QLineEdit; class QComboBox; class KviScriptEditor; class QToolButton; -class KviStyledCheckBox; class QSimpleRichText; class QPushButton; +#ifdef COMPILE_USE_QT4 + #include <q3simplerichtext.h> + #define QSimpleRichText Q3SimpleRichText +#else + #include <qsimplerichtext.h> +#endif + + + class KviActionEditorListViewItem : public KviTalListViewItem { public: diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp index a82879a6c..bccf8e5ab 100644 --- a/src/modules/dcc/canvaswidget.cpp +++ b/src/modules/dcc/canvaswidget.cpp @@ -1213,7 +1213,7 @@ void KviCanvasView::contentsMousePressEvent(QMouseEvent *e) beginDragLine(((KviCanvasLine *)hit),p); break; case KVI_CANVAS_RTTI_CONTROL_TYPE_POLYGON: - beginDragPolygon(((KviCanvasPolygon *)hit),p,e->state() & ShiftButton,e->state() & ControlButton); + beginDragPolygon(((KviCanvasPolygon *)hit),p,e->state() & Qt::ShiftButton,e->state() & Qt::ControlButton); break; } } else { diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/dialogs.cpp index 963abae5f..9f3f28465 100644 --- a/src/modules/dcc/dialogs.cpp +++ b/src/modules/dcc/dialogs.cpp @@ -55,7 +55,7 @@ KviDccAcceptBox::KviDccAcceptBox(KviDccBroker * br,KviDccDescriptor * dcc,const QLabel * l = new QLabel(text,this); vb->addWidget(l); QHBoxLayout *hb = new QHBoxLayout(4); - vb->addLayout(hb,AlignCenter); + vb->addLayout(hb,Qt::AlignCenter); QPushButton * btn = new QPushButton(__tr2qs_ctx("&Accept","dcc"),this); btn->setDefault(true); //btn->setFocus(); @@ -113,7 +113,7 @@ KviDccRenameBox::KviDccRenameBox(KviDccBroker * br,KviDccDescriptor * dcc,const vb->addWidget(l); QHBoxLayout *hb = new QHBoxLayout(4); - vb->addLayout(hb,AlignCenter); + vb->addLayout(hb,Qt::AlignCenter); QPushButton * btn = new QPushButton(__tr2qs_ctx("&Rename","dcc"),this); hb->addWidget(btn); diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp index 4237553a5..03512405e 100644 --- a/src/modules/dialog/libkvidialog.cpp +++ b/src/modules/dialog/libkvidialog.cpp @@ -213,7 +213,7 @@ KviKvsCallbackTextInput::KviKvsCallbackTextInput( { QLabel * il = new QLabel(this); il->setPixmap(*pix); - il->setAlignment(AlignCenter); + il->setAlignment(Qt::AlignCenter); g->addWidget(il,0,0); QLabel * tl = new QLabel(szLabel,this); g->addWidget(tl,0,1); diff --git a/src/modules/dockwidget/trayicon.cpp b/src/modules/dockwidget/trayicon.cpp index cf2e46d8d..ccb6ba9ef 100644 --- a/src/modules/dockwidget/trayicon.cpp +++ b/src/modules/dockwidget/trayicon.cpp @@ -200,14 +200,14 @@ void TrayIcon::mousePressEvent( QMouseEvent *e ) // This is for X11, menus appear on mouse press // I'm not sure whether Mac should be here or below.. Somebody check? switch ( e->button() ) { - case RightButton: + case Qt::RightButton: if ( pop ) { pop->popup( e->globalPos() ); e->accept(); } break; - case LeftButton: - case MidButton: + case Qt::LeftButton: + case Qt::MidButton: emit clicked( e->globalPos(), e->button() ); break; default: @@ -232,7 +232,7 @@ void TrayIcon::mouseReleaseEvent( QMouseEvent *e ) #ifdef Q_WS_WIN // This is for Windows, where menus appear on mouse release switch ( e->button() ) { - case RightButton: + case Qt::RightButton: if ( pop ) { // Necessary to make keyboard focus // and menu closing work on Windows. @@ -242,8 +242,8 @@ void TrayIcon::mouseReleaseEvent( QMouseEvent *e ) e->accept(); } break; - case LeftButton: - case MidButton: + case Qt::LeftButton: + case Qt::MidButton: emit clicked( e->globalPos(), e->button() ); break; default: @@ -265,7 +265,7 @@ void TrayIcon::mouseReleaseEvent( QMouseEvent *e ) */ void TrayIcon::mouseDoubleClickEvent( QMouseEvent *e ) { - if ( e->button() == LeftButton ) + if ( e->button() == Qt::LeftButton ) emit doubleClicked( e->globalPos() ); e->accept(); } diff --git a/src/modules/dockwidget/trayicon_win.cpp b/src/modules/dockwidget/trayicon_win.cpp index 5ba57625b..a916438af 100644 --- a/src/modules/dockwidget/trayicon_win.cpp +++ b/src/modules/dockwidget/trayicon_win.cpp @@ -153,16 +153,16 @@ public: QPoint gpos = QCursor::pos(); switch (m->lParam) { case WM_MOUSEMOVE: e = new QMouseEvent( QEvent::MouseMove, mapFromGlobal( gpos ), gpos, 0, 0 ); break; - case WM_LBUTTONDOWN: e = new QMouseEvent( QEvent::MouseButtonPress, mapFromGlobal( gpos ), gpos, LeftButton, LeftButton ); break; - case WM_LBUTTONUP: e = new QMouseEvent( QEvent::MouseButtonRelease, mapFromGlobal( gpos ), gpos, LeftButton, LeftButton ); break; - case WM_LBUTTONDBLCLK: e = new QMouseEvent( QEvent::MouseButtonDblClick, mapFromGlobal( gpos ), gpos, LeftButton, LeftButton ); break; - case WM_RBUTTONDOWN: e = new QMouseEvent( QEvent::MouseButtonPress, mapFromGlobal( gpos ), gpos, RightButton, RightButton ); break; - case WM_RBUTTONUP: e = new QMouseEvent( QEvent::MouseButtonRelease, mapFromGlobal( gpos ), gpos, RightButton, RightButton ); break; - case WM_RBUTTONDBLCLK: e = new QMouseEvent( QEvent::MouseButtonDblClick, mapFromGlobal( gpos ), gpos, RightButton, RightButton ); break; - case WM_MBUTTONDOWN: e = new QMouseEvent( QEvent::MouseButtonPress, mapFromGlobal( gpos ), gpos, MidButton, MidButton ); break; - case WM_MBUTTONUP: e = new QMouseEvent( QEvent::MouseButtonRelease, mapFromGlobal( gpos ), gpos, MidButton, MidButton ); break; - case WM_MBUTTONDBLCLK: e = new QMouseEvent( QEvent::MouseButtonDblClick, mapFromGlobal( gpos ), gpos, MidButton, MidButton ); break; - case WM_CONTEXTMENU: e = new QMouseEvent( QEvent::MouseButtonRelease, mapFromGlobal( gpos ), gpos, RightButton, RightButton ); break; + case WM_LBUTTONDOWN: e = new QMouseEvent( QEvent::MouseButtonPress, mapFromGlobal( gpos ), gpos, Qt::LeftButton, Qt::LeftButton ); break; + case WM_LBUTTONUP: e = new QMouseEvent( QEvent::MouseButtonRelease, mapFromGlobal( gpos ), gpos, Qt::LeftButton, Qt::LeftButton ); break; + case WM_LBUTTONDBLCLK: e = new QMouseEvent( QEvent::MouseButtonDblClick, mapFromGlobal( gpos ), gpos, Qt::LeftButton, Qt::LeftButton ); break; + case WM_RBUTTONDOWN: e = new QMouseEvent( QEvent::MouseButtonPress, mapFromGlobal( gpos ), gpos, Qt::RightButton, Qt::RightButton ); break; + case WM_RBUTTONUP: e = new QMouseEvent( QEvent::MouseButtonRelease, mapFromGlobal( gpos ), gpos, Qt::RightButton, Qt::RightButton ); break; + case WM_RBUTTONDBLCLK: e = new QMouseEvent( QEvent::MouseButtonDblClick, mapFromGlobal( gpos ), gpos, Qt::RightButton, Qt::RightButton ); break; + case WM_MBUTTONDOWN: e = new QMouseEvent( QEvent::MouseButtonPress, mapFromGlobal( gpos ), gpos, Qt::MidButton, Qt::MidButton ); break; + case WM_MBUTTONUP: e = new QMouseEvent( QEvent::MouseButtonRelease, mapFromGlobal( gpos ), gpos, Qt::MidButton, Qt::MidButton ); break; + case WM_MBUTTONDBLCLK: e = new QMouseEvent( QEvent::MouseButtonDblClick, mapFromGlobal( gpos ), gpos, Qt::MidButton, Qt::MidButton ); break; + case WM_CONTEXTMENU: e = new QMouseEvent( QEvent::MouseButtonRelease, mapFromGlobal( gpos ), gpos, Qt::RightButton, Qt::RightButton ); break; } if ( e ) { bool res = QApplication::sendEvent( iconObject, e ); diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp index 9fac05923..ddaa7cb19 100644 --- a/src/modules/editor/scripteditor.cpp +++ b/src/modules/editor/scripteditor.cpp @@ -216,9 +216,9 @@ void KviScriptEditorWidgetColorOptions::okClicked() KviScriptEditorWidget::KviScriptEditorWidget(QWidget * pParent) -: QTextEdit(pParent) +: KviTalTextEdit(pParent) { - setWordWrap(QTextEdit::NoWrap); + setWordWrap(KviTalTextEdit::NoWrap); m_pParent=pParent; m_szHelp="Nothing"; updateOptions(); @@ -234,9 +234,9 @@ KviScriptEditorWidget::~KviScriptEditorWidget() QPopupMenu * KviScriptEditorWidget::createPopupMenu( const QPoint& pos ) { - QPopupMenu *pop=QTextEdit::createPopupMenu(pos); - pop->insertItem(__tr2qs("Context sensitive help"),this,SLOT(slotHelp()),CTRL+Key_H); - pop->insertItem(__tr2qs("&Replace"),this,SLOT(slotReplace()),CTRL+Key_R); + QPopupMenu *pop=KviTalTextEdit::createPopupMenu(pos); + pop->insertItem(__tr2qs("Context sensitive help"),this,SLOT(slotHelp()),Qt::CTRL+Qt::Key_H); + pop->insertItem(__tr2qs("&Replace"),this,SLOT(slotReplace()),Qt::CTRL+Qt::Key_R); return pop; } @@ -271,7 +271,7 @@ void KviScriptEditorWidget::updateOptions() p.setColor(QColorGroup::Text,g_clrNormalText); setPalette(p); - setTextFormat(QTextEdit::PlainText); + setTextFormat(KviTalTextEdit::PlainText); // this will rehighlight everything setText(text()); // an "hack" to ensure Update all in the editor @@ -340,7 +340,7 @@ void KviScriptEditorWidget::keyPressEvent(QKeyEvent * e) } break; case Qt::Key_Return: - QTextEdit::keyPressEvent(e); + KviTalTextEdit::keyPressEvent(e); int para,pos; getCursorPosition(¶,&pos); if(para > 0) @@ -370,7 +370,7 @@ void KviScriptEditorWidget::keyPressEvent(QKeyEvent * e) setFocus(); break; } - QTextEdit::keyPressEvent(e); + KviTalTextEdit::keyPressEvent(e); emit keyPressed(); if(completelistbox->isVisible()) completition(0); @@ -405,7 +405,7 @@ void KviScriptEditorWidget::contentsMousePressEvent(QMouseEvent *e) //debug (buffer); m_szHelp=buffer; } - QTextEdit::contentsMousePressEvent(e); + KviTalTextEdit::contentsMousePressEvent(e); } @@ -979,8 +979,8 @@ void KviScriptEditorImplementation::saveToFile() void KviScriptEditorImplementation::setText(const QCString &txt) { m_pEditor->setText(txt.data()); - m_pEditor->setTextFormat(QTextEdit::PlainText); - m_pEditor->moveCursor(QTextEdit::MoveEnd,false); + m_pEditor->setTextFormat(KviTalTextEdit::PlainText); + m_pEditor->moveCursor(KviTalTextEdit::MoveEnd,false); m_pEditor->setModified(false); updateRowColLabel(); } @@ -996,8 +996,8 @@ QLineEdit * KviScriptEditorImplementation::getFindlineedit() void KviScriptEditorImplementation::setText(const QString &txt) { m_pEditor->setText(txt); - m_pEditor->setTextFormat(QTextEdit::PlainText); - m_pEditor->moveCursor(QTextEdit::MoveEnd,false); + m_pEditor->setTextFormat(KviTalTextEdit::PlainText); + m_pEditor->moveCursor(KviTalTextEdit::MoveEnd,false); m_pEditor->setModified(false); updateRowColLabel(); } @@ -1061,7 +1061,7 @@ void KviScriptEditorImplementation::loadFromFile() if(KviFileUtils::loadFile(fName,buffer)) { m_pEditor->setText(buffer); - m_pEditor->moveCursor(QTextEdit::MoveEnd,false); + m_pEditor->moveCursor(KviTalTextEdit::MoveEnd,false); updateRowColLabel(); } else { QString tmp; diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/scripteditor.h index d0a278688..44f96ac19 100644 --- a/src/modules/editor/scripteditor.h +++ b/src/modules/editor/scripteditor.h @@ -29,7 +29,7 @@ #include <qlabel.h> #include <qcstring.h> -#include <qtextedit.h> +#include <kvi_tal_textedit.h> #include <qsyntaxhighlighter.h> #include <qdialog.h> #include <qcheckbox.h> @@ -52,7 +52,7 @@ protected: virtual void keyPressEvent(QKeyEvent * e); }; -class KviScriptEditorWidget : public QTextEdit +class KviScriptEditorWidget : public KviTalTextEdit { Q_OBJECT Q_PROPERTY(bool contextSensitiveHelp READ contextSensitiveHelp) diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp index 89c785a3d..68b6fcd19 100644 --- a/src/modules/logview/logviewmdiwindow.cpp +++ b/src/modules/logview/logviewmdiwindow.cpp @@ -157,7 +157,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra setupItemList(); QAccel *a = new QAccel( this );
- a->connectItem( a->insertItem(Key_F+CTRL),
+ a->connectItem( a->insertItem(Qt::Key_F+Qt::CTRL),
m_pIrcView,
SLOT(toggleToolWidget()) ); } diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp index d8563882f..65be91c4d 100644 --- a/src/modules/mircimport/libkvimircimport.cpp +++ b/src/modules/mircimport/libkvimircimport.cpp @@ -138,7 +138,7 @@ void KviMircServersIniImport::die() KviRemoteMircServerImportWizard::KviRemoteMircServerImportWizard(KviRemoteMircServersIniImport * f) -: QWizard(0) +: KviTalWizard(0) { QString capt = __tr2qs("Remote mIRC servers.ini Import Wizard"); setCaption(capt); diff --git a/src/modules/mircimport/libkvimircimport.h b/src/modules/mircimport/libkvimircimport.h index d388ebb69..7f75e0907 100644 --- a/src/modules/mircimport/libkvimircimport.h +++ b/src/modules/mircimport/libkvimircimport.h @@ -26,7 +26,7 @@ #include "kvi_string.h" #include "kvi_http.h" -#include <qwizard.h> +#include <kvi_tal_wizard.h> #include <qlineedit.h> #include <qlabel.h> @@ -57,7 +57,7 @@ public: virtual void die(); }; -class KviRemoteMircServerImportWizard : public QWizard +class KviRemoteMircServerImportWizard : public KviTalWizard { Q_OBJECT public: diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp index dcaa44f84..d6e1045e7 100644 --- a/src/modules/notifier/notifierwindow.cpp +++ b/src/modules/notifier/notifierwindow.cpp @@ -713,11 +713,11 @@ void KviNotifierWindow::mousePressEvent(QMouseEvent * e) m_pntClick = e->pos(); - if(e->button() == RightButton) + if(e->button() == Qt::RightButton) { contextPopup(e->pos()); return; - } else if(e->button() == LeftButton) { + } else if(e->button() == Qt::LeftButton) { m_bLeftButtonIsPressed = true; } diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp index f836980d7..12d330bd8 100644 --- a/src/modules/objects/class_multilineedit.cpp +++ b/src/modules/objects/class_multilineedit.cpp @@ -31,9 +31,18 @@ #include "kvi_malloc.h" #include <qfile.h> +#ifdef COMPILE_USE_QT4 + #include <q3multilineedit.h> + #define KviTalMultiLineEdit Q3MultiLineEdit +#else + #include <qmultilineedit.h> + #define KviTalMultiLineEdit QMultiLineEdit +#endif + #include "class_multilineedit.h" + //->Tables for Text Format static char * const mod_tbl[] = { "PlainText", @@ -209,9 +218,9 @@ static int mod_cod[] = { !fn: $setAlignment(<alignment:string>) Sets the alignment of the current paragraph to <alignment>. Valid values are:[br] - AlignAuto - Aligns according to the language.[br] - - AlignLeft - Aligns with the left edge.[br] - - AlignRight - Aligns with the right edge.[br] - - AlignCenter - Centers in both dimensions. + - Qt::AlignLeft - Aligns with the left edge.[br] + - Qt::AlignRight - Aligns with the right edge.[br] + - Qt::AlignCenter - Centers in both dimensions. !fn: $setVerticalAlignment(<vertical_alignment:string>) Sets the vertical alignment of the current format to <Valignemnt>. Valid Values are:[br] - AlignNormal - Normal alignment.[br] @@ -333,7 +342,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_mledit) bool KviKvsObject_mledit::init(KviKvsRunTimeContext * pContext,KviKvsVariantList * pParams) { - setObject(new QMultiLineEdit(parentScriptWidget(),getName()),true); + setObject(new KviTalMultiLineEdit(parentScriptWidget(),getName()),true); return true; } @@ -346,7 +355,7 @@ bool KviKvsObject_mledit::functionSetReadOnly(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("bEnabled",KVS_PT_BOOL,0,bEnabled) KVSO_PARAMETERS_END(c) if(widget()) - ((QMultiLineEdit *)widget())->setReadOnly(bEnabled); + ((KviTalMultiLineEdit *)widget())->setReadOnly(bEnabled); return true; } @@ -359,9 +368,9 @@ bool KviKvsObject_mledit::functionTextLine(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("line",KVS_PT_INT,0,iLine) KVSO_PARAMETERS_END(c) if(!widget())return true; - if(iLine > ((QMultiLineEdit *)widget())->numLines() || iLine < 0) c->warning(__tr2qs("No such line number")); + if(iLine > ((KviTalMultiLineEdit *)widget())->numLines() || iLine < 0) c->warning(__tr2qs("No such line number")); else - c->returnValue()->setString(((QMultiLineEdit *)widget())->textLine(iLine)); + c->returnValue()->setString(((KviTalMultiLineEdit *)widget())->textLine(iLine)); return true; } @@ -375,7 +384,7 @@ bool KviKvsObject_mledit::functionInsertLine(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("line",KVS_PT_INT,KVS_PF_OPTIONAL,iLine) KVSO_PARAMETERS_END(c) if(!widget())return true; - ((QMultiLineEdit *)widget())->insertLine(szInsert,iLine); + ((KviTalMultiLineEdit *)widget())->insertLine(szInsert,iLine); return true; } @@ -386,9 +395,9 @@ bool KviKvsObject_mledit::functionRemoveLine(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("line",KVS_PT_INT,0,iLine) KVSO_PARAMETERS_END(c) if(!widget())return true; - if(iLine > ((QMultiLineEdit *)widget())->numLines() || iLine < 0) + if(iLine > ((KviTalMultiLineEdit *)widget())->numLines() || iLine < 0) c->warning("No such line number"); - else ((QMultiLineEdit *)widget())->removeLine(iLine); + else ((KviTalMultiLineEdit *)widget())->removeLine(iLine); return true; } @@ -403,17 +412,17 @@ bool KviKvsObject_mledit::functionInsertAt(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("col",KVS_PT_UNSIGNEDINTEGER,0,iCol) KVSO_PARAMETERS_END(c) if(!widget())return true; - if(iLine < 0 || iCol < 0 || iLine > ((QMultiLineEdit *)widget())->numLines()) + if(iLine < 0 || iCol < 0 || iLine > ((KviTalMultiLineEdit *)widget())->numLines()) c->warning("No such line number"); else - ((QMultiLineEdit *)widget())->insertAt(szInsert,iLine,iCol); + ((KviTalMultiLineEdit *)widget())->insertAt(szInsert,iLine,iCol); return true; } bool KviKvsObject_mledit::functionNumLines(KviKvsObjectFunctionCall *c) { - if(widget()) c->returnValue()->setInteger(((QMultiLineEdit *)widget())->numLines()); + if(widget()) c->returnValue()->setInteger(((KviTalMultiLineEdit *)widget())->numLines()); return true; } @@ -428,7 +437,7 @@ bool KviKvsObject_mledit::functionSetCursorPosition(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("mark",KVS_PT_BOOL,0,bFlag) KVSO_PARAMETERS_END(c) if(widget()) - ((QMultiLineEdit *)widget())->setCursorPosition(iLine, iCol, bFlag); + ((KviTalMultiLineEdit *)widget())->setCursorPosition(iLine, iCol, bFlag); return true; } @@ -437,9 +446,9 @@ bool KviKvsObject_mledit::functionCursorPosition(KviKvsObjectFunctionCall *c) if(!widget()) return true; int line, col; #if QT_VERSION >= 300 - ((QMultiLineEdit *)widget())->getCursorPosition(&line, &col); + ((KviTalMultiLineEdit *)widget())->getCursorPosition(&line, &col); #else - ((QMultiLineEdit *)widget())->cursorPosition(&line, &col); + ((KviTalMultiLineEdit *)widget())->cursorPosition(&line, &col); #endif KviKvsArray * a = new KviKvsArray(); a->set(0,new KviKvsVariant((kvs_int_t)line)); @@ -451,14 +460,14 @@ bool KviKvsObject_mledit::functionCursorPosition(KviKvsObjectFunctionCall *c) bool KviKvsObject_mledit::functionAtBeginning(KviKvsObjectFunctionCall *c) { if(!widget()) return true; - c->returnValue()->setBoolean(((QMultiLineEdit *)widget())->atBeginning()); + c->returnValue()->setBoolean(((KviTalMultiLineEdit *)widget())->atBeginning()); return true; } bool KviKvsObject_mledit::functionAtEnd(KviKvsObjectFunctionCall *c) { if(!widget()) return true; - c->returnValue()->setBoolean(((QMultiLineEdit *)widget())->atEnd()); + c->returnValue()->setBoolean(((KviTalMultiLineEdit *)widget())->atEnd()); return true; } @@ -470,13 +479,13 @@ bool KviKvsObject_mledit::functionSetWordWrap(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("word_wrap",KVS_PT_STRING,0,szWrap) KVSO_PARAMETERS_END(c) if(KviQString::equalCI(szWrap,"NoWrap")) - ((QMultiLineEdit *)widget())->setWordWrap(QTextEdit::NoWrap); + ((KviTalMultiLineEdit *)widget())->setWordWrap(KviTalMultiLineEdit::NoWrap); else if(KviQString::equalCI(szWrap,"WidgetWidth")) - ((QMultiLineEdit *)widget())->setWordWrap(QTextEdit::WidgetWidth); + ((KviTalMultiLineEdit *)widget())->setWordWrap(KviTalMultiLineEdit::WidgetWidth); else if(KviQString::equalCI(szWrap,"FixedPixelWidth")) - ((QMultiLineEdit *)widget())->setWordWrap(QTextEdit::FixedPixelWidth); + ((KviTalMultiLineEdit *)widget())->setWordWrap(KviTalMultiLineEdit::FixedPixelWidth); else if(KviQString::equalCI(szWrap,"FixedColumnWidth")) - ((QMultiLineEdit *)widget())->setWordWrap(QTextEdit::FixedColumnWidth); + ((KviTalMultiLineEdit *)widget())->setWordWrap(KviTalMultiLineEdit::FixedColumnWidth); else c->warning(__tr2qs("Unknown word wrap '%Q'"),&szWrap); return true; } @@ -489,13 +498,13 @@ bool KviKvsObject_mledit::functionsetWrapPolicy(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("wrap_policy",KVS_PT_STRING,0,szPolicy) KVSO_PARAMETERS_END(c) if(KviQString::equalCI(szPolicy,"AtWhiteSpace)")) - ((QMultiLineEdit *)widget())->setWrapPolicy(QTextEdit::AtWhiteSpace); + ((KviTalMultiLineEdit *)widget())->setWrapPolicy(KviTalMultiLineEdit::AtWhiteSpace); else if(KviQString::equalCI(szPolicy,"Anywhere")) - ((QMultiLineEdit *)widget())->setWrapPolicy(QTextEdit::Anywhere); + ((KviTalMultiLineEdit *)widget())->setWrapPolicy(KviTalMultiLineEdit::Anywhere); else if(KviQString::equalCI(szPolicy,"AtWordBoundary")) - ((QMultiLineEdit *)widget())->setWrapPolicy(QTextEdit::AtWordBoundary); + ((KviTalMultiLineEdit *)widget())->setWrapPolicy(KviTalMultiLineEdit::AtWordBoundary); else if(KviQString::equalCI(szPolicy,"AtWordOrDocumentBoundary")) - ((QMultiLineEdit *)widget())->setWrapPolicy(QTextEdit::AtWordOrDocumentBoundary); + ((KviTalMultiLineEdit *)widget())->setWrapPolicy(KviTalMultiLineEdit::AtWordOrDocumentBoundary); else c->warning(__tr2qs("Unknown wrap policy'%Q'"),&szPolicy); return true; } @@ -503,21 +512,21 @@ bool KviKvsObject_mledit::functionsetWrapPolicy(KviKvsObjectFunctionCall *c) bool KviKvsObject_mledit::functionWordWrap(KviKvsObjectFunctionCall *c) { if(widget()) - c->returnValue()->setBoolean(((QMultiLineEdit *)widget())->wordWrap() & QMultiLineEdit::WidgetWidth); + c->returnValue()->setBoolean(((KviTalMultiLineEdit *)widget())->wordWrap() & KviTalMultiLineEdit::WidgetWidth); return true; } bool KviKvsObject_mledit::functionText(KviKvsObjectFunctionCall *c) { if(widget()) - c->returnValue()->setString(((QMultiLineEdit *)widget())->text()); + c->returnValue()->setString(((KviTalMultiLineEdit *)widget())->text()); return true; } bool KviKvsObject_mledit::functionLength(KviKvsObjectFunctionCall *c) { if(widget()) - c->returnValue()->setInteger(((QMultiLineEdit *)widget())->length()); + c->returnValue()->setInteger(((KviTalMultiLineEdit *)widget())->length()); return true; } @@ -529,7 +538,7 @@ bool KviKvsObject_mledit::functionSetMaxLines(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("max_lines",KVS_PT_UNSIGNEDINTEGER,0,imaxLines) KVSO_PARAMETERS_END(c) if(widget()) - ((QMultiLineEdit *)widget())->setMaxLines(imaxLines); + ((KviTalMultiLineEdit *)widget())->setMaxLines(imaxLines); return true; } @@ -537,7 +546,7 @@ bool KviKvsObject_mledit::functionMaxLines(KviKvsObjectFunctionCall *c) { if(widget()) - c->returnValue()->setInteger(((QMultiLineEdit *)widget())->maxLines()); + c->returnValue()->setInteger(((KviTalMultiLineEdit *)widget())->maxLines()); return true; } @@ -549,7 +558,7 @@ bool KviKvsObject_mledit::functionInsert(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("text",KVS_PT_STRING,0,szInsert) KVSO_PARAMETERS_END(c) if (widget()) - ((QMultiLineEdit *)widget())->insert(szInsert); + ((KviTalMultiLineEdit *)widget())->insert(szInsert); return true; } @@ -561,28 +570,28 @@ bool KviKvsObject_mledit::functionAppend(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("text",KVS_PT_STRING,0,szAppend) KVSO_PARAMETERS_END(c) if (widget()) - ((QMultiLineEdit *)widget())->append(szAppend); + ((KviTalMultiLineEdit *)widget())->append(szAppend); return true; } bool KviKvsObject_mledit::functionCopy(KviKvsObjectFunctionCall *c) { if(widget()) - ((QMultiLineEdit *)widget())->copy(); + ((KviTalMultiLineEdit *)widget())->copy(); return true; } bool KviKvsObject_mledit::functionCut(KviKvsObjectFunctionCall *c) { if(widget()) - ((QMultiLineEdit *)widget())->cut(); + ((KviTalMultiLineEdit *)widget())->cut(); return true; } bool KviKvsObject_mledit::functionPaste(KviKvsObjectFunctionCall *c) { if(widget()) - ((QMultiLineEdit *)widget())->paste(); + ((KviTalMultiLineEdit *)widget())->paste(); return true; } //->Set Bold, Italic, Underline @@ -593,7 +602,7 @@ bool KviKvsObject_mledit::functionsetBold(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("bBold",KVS_PT_BOOL,0,bFlag) KVSO_PARAMETERS_END(c) if (widget()) - ((QMultiLineEdit *)widget())->setBold(bFlag); + ((KviTalMultiLineEdit *)widget())->setBold(bFlag); return true; } bool KviKvsObject_mledit::functionsetUnderline(KviKvsObjectFunctionCall *c) @@ -603,7 +612,7 @@ bool KviKvsObject_mledit::functionsetUnderline(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("bUnderline",KVS_PT_BOOL,0,bFlag) KVSO_PARAMETERS_END(c) if (widget()) - ((QMultiLineEdit *)widget())->setUnderline(bFlag); + ((KviTalMultiLineEdit *)widget())->setUnderline(bFlag); return true; } @@ -614,7 +623,7 @@ bool KviKvsObject_mledit::functionsetItalic(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("bItalic",KVS_PT_BOOL,0,bFlag) KVSO_PARAMETERS_END(c) if (widget()) - ((QMultiLineEdit *)widget())->setItalic(bFlag); + ((KviTalMultiLineEdit *)widget())->setItalic(bFlag); return true; } @@ -623,19 +632,19 @@ bool KviKvsObject_mledit::functionsetItalic(KviKvsObjectFunctionCall *c) bool KviKvsObject_mledit::functionbold(KviKvsObjectFunctionCall *c) { if(widget()) - c->returnValue()->setBoolean(((QMultiLineEdit *)widget())->bold()); + c->returnValue()->setBoolean(((KviTalMultiLineEdit *)widget())->bold()); return true; } bool KviKvsObject_mledit::functionitalic(KviKvsObjectFunctionCall *c) { if(widget()) - c->returnValue()->setBoolean(((QMultiLineEdit *)widget())->italic()); + c->returnValue()->setBoolean(((KviTalMultiLineEdit *)widget())->italic()); return true; } bool KviKvsObject_mledit::functionunderline(KviKvsObjectFunctionCall *c) { if(widget()) - c->returnValue()->setBoolean(((QMultiLineEdit *)widget())->underline()); + c->returnValue()->setBoolean(((KviTalMultiLineEdit *)widget())->underline()); return true; } //->Zoom In, out at @@ -647,9 +656,9 @@ bool KviKvsObject_mledit::functionzoomIn(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_END(c) if (!widget()) return true; if (!iZoom) - ((QMultiLineEdit *)object())->zoomIn(); + ((KviTalMultiLineEdit *)object())->zoomIn(); else - ((QMultiLineEdit *)object())->zoomIn(iZoom); + ((KviTalMultiLineEdit *)object())->zoomIn(iZoom); return true; } @@ -661,9 +670,9 @@ bool KviKvsObject_mledit::functionzoomOut(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_END(c) if (!widget()) return true; if (!iZoom) - ((QMultiLineEdit *)object())->zoomOut(); + ((KviTalMultiLineEdit *)object())->zoomOut(); else - ((QMultiLineEdit *)object())->zoomOut(iZoom); + ((KviTalMultiLineEdit *)object())->zoomOut(iZoom); return true; } bool KviKvsObject_mledit::functionzoomTo(KviKvsObjectFunctionCall *c) @@ -673,7 +682,7 @@ bool KviKvsObject_mledit::functionzoomTo(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("zoom_size",KVS_PT_INT,0,iZoom) KVSO_PARAMETERS_END(c) if (widget()) - ((QMultiLineEdit *)object())->zoomTo(iZoom); + ((KviTalMultiLineEdit *)object())->zoomTo(iZoom); return true; } //-> Undo & Redo functions @@ -681,31 +690,31 @@ bool KviKvsObject_mledit::functionzoomTo(KviKvsObjectFunctionCall *c) bool KviKvsObject_mledit::functionundo(KviKvsObjectFunctionCall *c) { if(widget()) - ((QMultiLineEdit *)widget())->undo(); + ((KviTalMultiLineEdit *)widget())->undo(); return true; } bool KviKvsObject_mledit::functionredo(KviKvsObjectFunctionCall *c) { if(widget()) - ((QMultiLineEdit *)widget())->redo(); + ((KviTalMultiLineEdit *)widget())->redo(); return true; } bool KviKvsObject_mledit::functionclear(KviKvsObjectFunctionCall *c) { if(widget()) - ((QMultiLineEdit *)widget())->clear(); + ((KviTalMultiLineEdit *)widget())->clear(); return true; } bool KviKvsObject_mledit::functiondel(KviKvsObjectFunctionCall *c) { if(widget()) - ((QMultiLineEdit *)widget())->del(); + ((KviTalMultiLineEdit *)widget())->del(); return true; } bool KviKvsObject_mledit::functionindent(KviKvsObjectFunctionCall *c) { if(widget()) - ((QMultiLineEdit *)widget())->indent(); + ((KviTalMultiLineEdit *)widget())->indent(); return true; } @@ -716,26 +725,26 @@ bool KviKvsObject_mledit::functionsetUndoRedoEnabled(KviKvsObjectFunctionCall *c KVSO_PARAMETER("bUndoredo",KVS_PT_BOOL,0,bFlag) KVSO_PARAMETERS_END(c) if (widget()) - ((QMultiLineEdit *)widget())->setUndoRedoEnabled(bFlag); + ((KviTalMultiLineEdit *)widget())->setUndoRedoEnabled(bFlag); return true; } bool KviKvsObject_mledit::functionisUndoRedoEnabled(KviKvsObjectFunctionCall *c) { if(widget()) - c->returnValue()->setBoolean(((QMultiLineEdit *)widget())->isUndoRedoEnabled()); + c->returnValue()->setBoolean(((KviTalMultiLineEdit *)widget())->isUndoRedoEnabled()); return true; } bool KviKvsObject_mledit::functionisUndoAvailable(KviKvsObjectFunctionCall *c) { if(widget()) - c->returnValue()->setBoolean(((QMultiLineEdit *)widget())->isUndoAvailable()); + c->returnValue()->setBoolean(((KviTalMultiLineEdit *)widget())->isUndoAvailable()); return true; } bool KviKvsObject_mledit::functionisRedoAvailable(KviKvsObjectFunctionCall *c) { if(widget()) - c->returnValue()->setBoolean(((QMultiLineEdit *)widget())->isRedoAvailable()); + c->returnValue()->setBoolean(((KviTalMultiLineEdit *)widget())->isRedoAvailable()); return true; } bool KviKvsObject_mledit::functionsetUndoDepth(KviKvsObjectFunctionCall *c) @@ -745,14 +754,14 @@ bool KviKvsObject_mledit::functionsetUndoDepth(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("undo_depth",KVS_PT_UNSIGNEDINTEGER,0,iDepth) KVSO_PARAMETERS_END(c) if (widget()) - ((QMultiLineEdit *)object())->setUndoDepth(iDepth); + ((KviTalMultiLineEdit *)object())->setUndoDepth(iDepth); return true; } bool KviKvsObject_mledit::functionundoDepth(KviKvsObjectFunctionCall *c) { if(widget()) - c->returnValue()->setInteger(((QMultiLineEdit *)widget())->undoDepth()); + c->returnValue()->setInteger(((KviTalMultiLineEdit *)widget())->undoDepth()); return true; } @@ -765,7 +774,7 @@ bool KviKvsObject_mledit::functionsetText(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("text",KVS_PT_STRING,0,szText) KVSO_PARAMETERS_END(c) if (widget()) - ((QMultiLineEdit *)widget())->setText(szText); + ((KviTalMultiLineEdit *)widget())->setText(szText); return true; } bool KviKvsObject_mledit::functionsetColor(KviKvsObjectFunctionCall *c) @@ -822,7 +831,7 @@ bool KviKvsObject_mledit::functionsetColor(KviKvsObjectFunctionCall *c) c->warning(__tr2qs("Not an hex digits")); return true; } - if (widget()) ((QMultiLineEdit *)widget())->setColor(QColor(iColR,iColG,iColB)); + if (widget()) ((KviTalMultiLineEdit *)widget())->setColor(QColor(iColR,iColG,iColB)); return true; } if(c->params()->count() < 3) @@ -836,7 +845,7 @@ bool KviKvsObject_mledit::functionsetColor(KviKvsObjectFunctionCall *c) return false; } } - if (widget()) ((QMultiLineEdit *)widget())->setColor(QColor(iColR,iColG,iColB)); + if (widget()) ((KviTalMultiLineEdit *)widget())->setColor(QColor(iColR,iColG,iColB)); return true; } @@ -847,7 +856,7 @@ bool KviKvsObject_mledit::functionsetPointSize(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("point_size",KVS_PT_UNSIGNEDINTEGER,0,uPointSize) KVSO_PARAMETERS_END(c) if (widget()) - ((QMultiLineEdit *)widget())->setPointSize(uPointSize); + ((KviTalMultiLineEdit *)widget())->setPointSize(uPointSize); return true; } @@ -858,7 +867,7 @@ bool KviKvsObject_mledit::functionsetLinkUnderline(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("bLinkunderline",KVS_PT_BOOL,0,bFlag) KVSO_PARAMETERS_END(c) if (widget()) - ((QMultiLineEdit *)widget())->setLinkUnderline(bFlag); + ((KviTalMultiLineEdit *)widget())->setLinkUnderline(bFlag); return true; } @@ -869,7 +878,7 @@ bool KviKvsObject_mledit::functionsetFamily(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("family",KVS_PT_STRING,0,szFamily) KVSO_PARAMETERS_END(c) if (widget()) - ((QMultiLineEdit *)widget())->setFamily(szFamily); + ((KviTalMultiLineEdit *)widget())->setFamily(szFamily); return true; } @@ -880,7 +889,7 @@ bool KviKvsObject_mledit::functionsetModified(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("bModified",KVS_PT_BOOL,0,bFlag) KVSO_PARAMETERS_END(c) if (widget()) - ((QMultiLineEdit *)widget())->setModified(bFlag); + ((KviTalMultiLineEdit *)widget())->setModified(bFlag); return true; } @@ -893,7 +902,7 @@ bool KviKvsObject_mledit::functioninsertParagraph(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("paragraph",KVS_PT_INT,0,iParagraph) KVSO_PARAMETERS_END(c) if(widget()) - ((QMultiLineEdit *)widget())->insertParagraph(szText,iParagraph); + ((KviTalMultiLineEdit *)widget())->insertParagraph(szText,iParagraph); return true; } @@ -904,7 +913,7 @@ bool KviKvsObject_mledit::functionremoveParagraph(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("paragraph",KVS_PT_INT,0,iParagraph) KVSO_PARAMETERS_END(c) if(widget()) - ((QMultiLineEdit*)widget())->removeParagraph(iParagraph); + ((KviTalMultiLineEdit*)widget())->removeParagraph(iParagraph); return true; } @@ -915,7 +924,7 @@ bool KviKvsObject_mledit::functionsetOverwriteMode(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("bOverwritemode",KVS_PT_BOOL,0,bFlag) KVSO_PARAMETERS_END(c) if (widget()) - ((QMultiLineEdit *)widget())->setOverwriteMode(bFlag); + ((KviTalMultiLineEdit *)widget())->setOverwriteMode(bFlag); return true; } @@ -923,7 +932,7 @@ bool KviKvsObject_mledit::functiontextFormat(KviKvsObjectFunctionCall *c) { if(!widget())return true; - int fstyle = ((QMultiLineEdit *)widget())->textFormat(); + int fstyle = ((KviTalMultiLineEdit *)widget())->textFormat(); QString format=""; for(unsigned int i = 0; i < mod_num; i++) { @@ -945,13 +954,13 @@ bool KviKvsObject_mledit::functionsetTextFormat(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_END(c) if(!widget()) return true; if(KviQString::equalCI(szFormat,"PlainText")) - ((QMultiLineEdit *)widget())->setTextFormat(Qt::PlainText); + ((KviTalMultiLineEdit *)widget())->setTextFormat(Qt::PlainText); else if(KviQString::equalCI(szFormat,"RichText")) - ((QMultiLineEdit *)widget())->setTextFormat(Qt::RichText); + ((KviTalMultiLineEdit *)widget())->setTextFormat(Qt::RichText); else if(KviQString::equalCI(szFormat,"LogText")) - ((QMultiLineEdit *)widget())->setTextFormat(Qt::LogText); + ((KviTalMultiLineEdit *)widget())->setTextFormat(Qt::LogText); else if(KviQString::equalCI(szFormat,"AutoText")) - ((QMultiLineEdit *)widget())->setTextFormat(Qt::AutoText); + ((KviTalMultiLineEdit *)widget())->setTextFormat(Qt::AutoText); else c->warning(__tr2qs("Unknown text format '%Q'"),&szFormat); return true; } @@ -1011,7 +1020,7 @@ bool KviKvsObject_mledit::functionsetParagraphBackgroundColor(KviKvsObjectFuncti c->warning(__tr2qs("Not an hex digits")); return true; } - if (widget()) ((QMultiLineEdit *)widget())->setParagraphBackgroundColor(iParagraph,QColor(iColR,iColG,iColB)); + if (widget()) ((KviTalMultiLineEdit *)widget())->setParagraphBackgroundColor(iParagraph,QColor(iColR,iColG,iColB)); return true; } if(c->params()->count() < 3) @@ -1025,7 +1034,7 @@ bool KviKvsObject_mledit::functionsetParagraphBackgroundColor(KviKvsObjectFuncti return false; } } - if (widget()) ((QMultiLineEdit *)widget())->setParagraphBackgroundColor(iParagraph,QColor(iColR,iColG,iColB)); + if (widget()) ((KviTalMultiLineEdit *)widget())->setParagraphBackgroundColor(iParagraph,QColor(iColR,iColG,iColB)); return true; } @@ -1036,7 +1045,7 @@ bool KviKvsObject_mledit::functionclearParagraphBackground(KviKvsObjectFunctionC KVSO_PARAMETER("paragraph",KVS_PT_INT,0,iParagraph) KVSO_PARAMETERS_END(c) if(widget()) - ((QMultiLineEdit*)widget())->clearParagraphBackground(iParagraph); + ((KviTalMultiLineEdit*)widget())->clearParagraphBackground(iParagraph); return true; } @@ -1063,7 +1072,7 @@ bool KviKvsObject_mledit::functionloadFile(KviKvsObjectFunctionCall *c) QString txt = ts.read(); if ( !QStyleSheet::mightBeRichText( txt ) ) txt = QStyleSheet::convertFromPlainText( txt, QStyleSheetItem::WhiteSpacePre ); - ((QMultiLineEdit *)widget())->setText( txt ); + ((KviTalMultiLineEdit *)widget())->setText( txt ); file.close(); return true; } @@ -1077,13 +1086,13 @@ bool KviKvsObject_mledit::functionsetAlignment(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_END(c) if(!widget()) return true; if(KviQString::equalCI(szAlignment,"Left")) - ((QMultiLineEdit *)widget())->setAlignment(Qt::AlignLeft); + ((KviTalMultiLineEdit *)widget())->setAlignment(Qt::AlignLeft); else if(KviQString::equalCI(szAlignment,"Right")) - ((QMultiLineEdit *)widget())->setAlignment(Qt::AlignRight); + ((KviTalMultiLineEdit *)widget())->setAlignment(Qt::AlignRight); else if(KviQString::equalCI(szAlignment,"Center")) - ((QMultiLineEdit *)widget())->setAlignment(Qt::AlignCenter); + ((KviTalMultiLineEdit *)widget())->setAlignment(Qt::AlignCenter); else if(KviQString::equalCI(szAlignment,"Justify")) - ((QMultiLineEdit *)widget())->setAlignment(Qt::AlignJustify); + ((KviTalMultiLineEdit *)widget())->setAlignment(Qt::AlignJustify); else c->warning(__tr2qs("Unknown alignment '%Q'"),&szAlignment); return true; } @@ -1097,11 +1106,11 @@ bool KviKvsObject_mledit::functionsetAutoFormatting(KviKvsObjectFunctionCall *c) KVSO_PARAMETERS_END(c) if(!widget()) return true; if(KviQString::equalCI(szAutoformatting,"AutoNone")) - ((QMultiLineEdit *)widget())->setAlignment(QTextEdit::AutoNone); + ((KviTalMultiLineEdit *)widget())->setAlignment(KviTalMultiLineEdit::AutoNone); else if(KviQString::equalCI(szAutoformatting,"BulletList")) - ((QMultiLineEdit *)widget())->setAlignment(QTextEdit::AutoBulletList); + ((KviTalMultiLineEdit *)widget())->setAlignment(KviTalMultiLineEdit::AutoBulletList); else if(KviQString::equalCI(szAutoformatting,"AutoAll")) - ((QMultiLineEdit *)widget())->setAlignment(QTextEdit::AutoAll); + ((KviTalMultiLineEdit *)widget())->setAlignment(KviTalMultiLineEdit::AutoAll); else c->warning(__tr2qs("Unknown auto formatting mode '%Q'"),&szAutoformatting); return true; } @@ -1115,11 +1124,11 @@ bool KviKvsObject_mledit::functionsetVerticalAlignment(KviKvsObjectFunctionCall KVSO_PARAMETERS_END(c) if(!widget()) return true; if(KviQString::equalCI(szValignment,"Normal")) - ((QMultiLineEdit *)widget())->setVerticalAlignment(QTextEdit::AlignNormal); + ((KviTalMultiLineEdit *)widget())->setVerticalAlignment(KviTalMultiLineEdit::AlignNormal); else if(KviQString::equalCI(szValignment,"SuperScript")) - ((QMultiLineEdit *)widget())->setVerticalAlignment(QTextEdit::AlignSuperScript); + ((KviTalMultiLineEdit *)widget())->setVerticalAlignment(KviTalMultiLineEdit::AlignSuperScript); else if(KviQString::equalCI(szValignment,"SubScript")) - ((QMultiLineEdit *)widget())->setVerticalAlignment(QTextEdit::AlignSubScript); + ((KviTalMultiLineEdit *)widget())->setVerticalAlignment(KviTalMultiLineEdit::AlignSubScript); else c->warning(__tr2qs("Unknown vertical alignment '%Q'"),&szValignment); return true; } @@ -1127,7 +1136,7 @@ bool KviKvsObject_mledit::functionsetVerticalAlignment(KviKvsObjectFunctionCall bool KviKvsObject_mledit::functionparagraphs(KviKvsObjectFunctionCall *c) { if(widget()) - c->returnValue()->setInteger(((QMultiLineEdit *)widget())->paragraphs()); + c->returnValue()->setInteger(((KviTalMultiLineEdit *)widget())->paragraphs()); return true; } @@ -1135,7 +1144,7 @@ bool KviKvsObject_mledit::functionparagraphs(KviKvsObjectFunctionCall *c) bool KviKvsObject_mledit::functionlines(KviKvsObjectFunctionCall *c) { if(widget()) - c->returnValue()->setInteger(((QMultiLineEdit *)widget())->lines()); + c->returnValue()->setInteger(((KviTalMultiLineEdit *)widget())->lines()); return true; } @@ -1147,7 +1156,7 @@ bool KviKvsObject_mledit::functionlineOfChar(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("index",KVS_PT_INT,0,iIndex) KVSO_PARAMETERS_END(c) if (widget()) - c->returnValue()->setInteger(((QMultiLineEdit *)widget())->lineOfChar(iPara,iIndex)); + c->returnValue()->setInteger(((KviTalMultiLineEdit *)widget())->lineOfChar(iPara,iIndex)); return true; } @@ -1158,7 +1167,7 @@ bool KviKvsObject_mledit::functionlinesOfParagraph(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("paragraph",KVS_PT_INT,0,iLine) KVSO_PARAMETERS_END(c) if(widget()) - c->returnValue()->setInteger(((QMultiLineEdit *)widget())->linesOfParagraph(iLine)); + c->returnValue()->setInteger(((KviTalMultiLineEdit *)widget())->linesOfParagraph(iLine)); return true; } @@ -1170,7 +1179,7 @@ bool KviKvsObject_mledit::functionparagraphLength(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("paragraph",KVS_PT_INT,0,iParagraph) KVSO_PARAMETERS_END(c) if(widget()) - c->returnValue()->setInteger(((QMultiLineEdit *)widget())->paragraphLength(iParagraph)); + c->returnValue()->setInteger(((KviTalMultiLineEdit *)widget())->paragraphLength(iParagraph)); return true; } @@ -1182,7 +1191,7 @@ bool KviKvsObject_mledit::functionselectAll(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("bSelectall",KVS_PT_BOOL,0,bFlag) KVSO_PARAMETERS_END(c) if (widget()) - ((QMultiLineEdit *)widget())->selectAll(bFlag); + ((KviTalMultiLineEdit *)widget())->selectAll(bFlag); return true; } diff --git a/src/modules/objects/class_multilineedit.h b/src/modules/objects/class_multilineedit.h index aa308ddf5..c3abb6afd 100644 --- a/src/modules/objects/class_multilineedit.h +++ b/src/modules/objects/class_multilineedit.h @@ -27,7 +27,6 @@ #include "class_widget.h" -#include <qmultilineedit.h> #include "object_macros.h" class KviKvsObject_mledit : public KviKvsObject_widget diff --git a/src/modules/objects/class_wizard.cpp b/src/modules/objects/class_wizard.cpp index fb56a57de..83117af97 100644 --- a/src/modules/objects/class_wizard.cpp +++ b/src/modules/objects/class_wizard.cpp @@ -21,7 +21,7 @@ // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // -#include <qwizard.h> +#include <kvi_tal_wizard.h> #include <qpushbutton.h> #include "class_wizard.h" #include "kvi_error.h" @@ -147,7 +147,7 @@ bool KviKvsObject_wizard::functionaddPage(KviKvsObjectFunctionCall *c) c->warning(__tr2qs("Can't add a non-widget object")); return true; } - ((QWizard *)widget())->addPage(((QWidget *)(ob->object())),szLabel); + ((KviTalWizard *)widget())->addPage(((QWidget *)(ob->object())),szLabel); return true; } bool KviKvsObject_wizard::functioninsertPage(KviKvsObjectFunctionCall *c) @@ -168,7 +168,7 @@ bool KviKvsObject_wizard::functioninsertPage(KviKvsObjectFunctionCall *c) c->warning(__tr2qs("Can't add a non-widget object")); return true; } - ((QWizard *)widget())->insertPage(((QWidget *)(ob->object())),szLabel,uIndex); + ((KviTalWizard *)widget())->insertPage(((QWidget *)(ob->object())),szLabel,uIndex); return true; } @@ -186,7 +186,7 @@ bool KviKvsObject_wizard::functionremovePage(KviKvsObjectFunctionCall *c) c->warning(__tr2qs("Not a widget object")); return true; } - ((QWizard *)widget())->removePage(((QWidget *)(ob->object()))); + ((KviTalWizard *)widget())->removePage(((QWidget *)(ob->object()))); return true; } bool KviKvsObject_wizard::functionsetTitle(KviKvsObjectFunctionCall *c) @@ -205,7 +205,7 @@ bool KviKvsObject_wizard::functionsetTitle(KviKvsObjectFunctionCall *c) c->warning(__tr2qs("Widget object required")); return true; } - ((QWizard *)widget())->setTitle(((QWidget *)(ob->object())),szTitle); + ((KviTalWizard *)widget())->setTitle(((QWidget *)(ob->object())),szTitle); return true; } bool KviKvsObject_wizard::functionsetBackEnabled(KviKvsObjectFunctionCall *c) @@ -224,7 +224,7 @@ bool KviKvsObject_wizard::functionsetBackEnabled(KviKvsObjectFunctionCall *c) c->warning(__tr2qs("Widget object required")); return true; } - ((QWizard *)widget())->setBackEnabled(((QWidget *)(ob->object())),bEnabled); + ((KviTalWizard *)widget())->setBackEnabled(((QWidget *)(ob->object())),bEnabled); return true; } @@ -244,7 +244,7 @@ bool KviKvsObject_wizard::functionsetNextEnabled(KviKvsObjectFunctionCall *c) c->warning(__tr2qs("Widget object required")); return true; } - ((QWizard *)widget())->setNextEnabled(((QWidget *)(ob->object())),bEnabled); + ((KviTalWizard *)widget())->setNextEnabled(((QWidget *)(ob->object())),bEnabled); return true; } bool KviKvsObject_wizard::functionsetFinishEnabled(KviKvsObjectFunctionCall *c) @@ -263,7 +263,7 @@ bool KviKvsObject_wizard::functionsetFinishEnabled(KviKvsObjectFunctionCall *c) c->warning(__tr2qs("Widget object required")); return true; } - ((QWizard *)widget())->setFinishEnabled(((QWidget *)(ob->object())),bEnabled); + ((KviTalWizard *)widget())->setFinishEnabled(((QWidget *)(ob->object())),bEnabled); return true; } bool KviKvsObject_wizard::functionsetHelpEnabled(KviKvsObjectFunctionCall *c) @@ -282,7 +282,7 @@ bool KviKvsObject_wizard::functionsetHelpEnabled(KviKvsObjectFunctionCall *c) c->warning(__tr2qs("Widget object required")); return true; } - ((QWizard *)widget())->setHelpEnabled(((QWidget *)(ob->object())),bEnabled); + ((KviTalWizard *)widget())->setHelpEnabled(((QWidget *)(ob->object())),bEnabled); return true; } bool KviKvsObject_wizard::functionsetBackBtnText(KviKvsObjectFunctionCall *c) @@ -292,7 +292,7 @@ bool KviKvsObject_wizard::functionsetBackBtnText(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("text",KVS_PT_STRING,0,szText) KVSO_PARAMETERS_END(c) if (widget()) - ((QWizard *)widget())->QWizard::backButton()->setText(szText); + ((KviTalWizard *)widget())->KviTalWizard::backButton()->setText(szText); return true; } bool KviKvsObject_wizard::functionsetNextBtnText(KviKvsObjectFunctionCall *c) @@ -302,7 +302,7 @@ bool KviKvsObject_wizard::functionsetNextBtnText(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("text",KVS_PT_STRING,0,szText) KVSO_PARAMETERS_END(c) if (widget()) - ((QWizard *)widget())->QWizard::nextButton()->setText(szText); + ((KviTalWizard *)widget())->KviTalWizard::nextButton()->setText(szText); return true; } bool KviKvsObject_wizard::functionsetHelpBtnText(KviKvsObjectFunctionCall *c) @@ -312,7 +312,7 @@ bool KviKvsObject_wizard::functionsetHelpBtnText(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("text",KVS_PT_STRING,0,szText) KVSO_PARAMETERS_END(c) if (widget()) - ((QWizard *)widget())->QWizard::helpButton()->setText(szText); + ((KviTalWizard *)widget())->KviTalWizard::helpButton()->setText(szText); return true; } bool KviKvsObject_wizard::functionsetFinishBtnText(KviKvsObjectFunctionCall *c) @@ -322,7 +322,7 @@ bool KviKvsObject_wizard::functionsetFinishBtnText(KviKvsObjectFunctionCall *c) KVSO_PARAMETER("text",KVS_PT_STRING,0,szText) KVSO_PARAMETERS_END(c) if (widget()) - ((QWizard *)widget())->QWizard::finishButton()->setText(szText); + ((KviTalWizard *)widget())->KviTalWizard::finishButton()->setText(szText); return true; } bool KviKvsObject_wizard::accept() @@ -360,7 +360,7 @@ void KviKvsObject_wizard::backClicked() callFunction(this,"backClickedEvent",params); } KviKvsMdmWizard::KviKvsMdmWizard(QWidget * par,const char * name,KviKvsObject_wizard * parent) -:QWizard( par,name) +:KviTalWizard( par,name) { m_pParentScript=parent; connect (this->backButton(),SIGNAL(clicked()),this,SLOT(slotBackClicked())); @@ -368,12 +368,12 @@ KviKvsMdmWizard::KviKvsMdmWizard(QWidget * par,const char * name,KviKvsObject_wi } void KviKvsMdmWizard::accept() { - if(m_pParentScript->accept())QWizard::accept(); + if(m_pParentScript->accept())KviTalWizard::accept(); } void KviKvsMdmWizard::reject() { - if(m_pParentScript->reject())QWizard::reject(); + if(m_pParentScript->reject())KviTalWizard::reject(); } void KviKvsMdmWizard::slotNextClicked() diff --git a/src/modules/objects/class_wizard.h b/src/modules/objects/class_wizard.h index 047b0dfb4..63c88fd96 100644 --- a/src/modules/objects/class_wizard.h +++ b/src/modules/objects/class_wizard.h @@ -22,7 +22,7 @@ // along with this program. If not, write to the Free Software Foundation, // Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. // -#include <qwizard.h> +#include <kvi_tal_wizard.h> #include "class_widget.h" @@ -61,7 +61,7 @@ protected: bool functionbackClickedEvent(KviKvsObjectFunctionCall *c); }; -class KviKvsMdmWizard : public QWizard +class KviKvsMdmWizard : public KviTalWizard { Q_OBJECT diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp index e2af1c140..ef66a61ef 100644 --- a/src/modules/options/container.cpp +++ b/src/modules/options/container.cpp @@ -30,6 +30,11 @@ #include <qlayout.h> #include <qpushbutton.h> #include <qtooltip.h> +#include <qevent.h> + +#ifdef COMPILE_USE_QT4 + #include <qdesktopwidget.h> +#endif extern KviOptionsInstanceManager * g_pOptionsInstanceManager; diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp index 010c06b58..5614fe61b 100644 --- a/src/modules/options/dialog.cpp +++ b/src/modules/options/dialog.cpp @@ -34,7 +34,7 @@ #include "kvi_ptrdict.h" #include <qlayout.h> -#include <qaccel.h> +#include "kvi_accel.h" #include <qlabel.h> #include "kvi_tal_vbox.h" #include <qsplitter.h> @@ -50,6 +50,7 @@ #include <qobjectlist.h> #include <qpainter.h> #include <qfont.h> +#include <qevent.h> //extern KviModule * g_pOptionsModule; @@ -64,7 +65,7 @@ KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(QWidget *parent,const createLayout(1,1); QLabel * l = new QLabel(szText,this); - l->setAlignment(AlignTop); + l->setAlignment(Qt::AlignTop); layout()->addWidget(l,0,0); } @@ -281,8 +282,8 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup) KVI_OPTION_RECT(KviOption_rectGeneralOptionsDialogGeometry).y()); } - QAccel *a = new QAccel( this ); - a->connectItem( a->insertItem(Key_Escape), this,SLOT(close()) ); + KviAccel *a = new KviAccel( this ); + a->connectItem( a->insertItem(Qt::Key_Escape), this,SLOT(close()) ); } KviOptionsDialog::~KviOptionsDialog() diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp index 2c11230d3..5927be5e2 100644 --- a/src/modules/options/optw_servers.cpp +++ b/src/modules/options/optw_servers.cpp @@ -102,7 +102,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n QLabel * l = new QLabel(szTmp,this); l->setFrameStyle(QFrame::Raised | QFrame::StyledPanel); - l->setAlignment(AlignCenter); + l->setAlignment(Qt::AlignCenter); l->setMargin(10); g->addMultiCellWidget(l,0,0,0,3); l->setMinimumWidth(200); @@ -451,7 +451,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s) m_pHeaderLabel = new QLabel("",this); // the text will be set later m_pHeaderLabel->setFrameStyle(QFrame::Raised | QFrame::StyledPanel); - m_pHeaderLabel->setAlignment(AlignCenter); + m_pHeaderLabel->setAlignment(Qt::AlignCenter); m_pHeaderLabel->setMargin(10); g->addMultiCellWidget(m_pHeaderLabel,0,0,0,3); m_pHeaderLabel->setMinimumWidth(200); diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp index 3bc6d2532..e1101c58c 100644 --- a/src/modules/reguser/edituser.cpp +++ b/src/modules/reguser/edituser.cpp @@ -205,7 +205,7 @@ KviReguserMaskDialog::KviReguserMaskDialog(QWidget * p,KviIrcMask * m) QGridLayout * g = new QGridLayout(this,3,2,4,4); QLabel * l = new QLabel(__tr2qs("Insert a mask for this user.<br>It can contain the wildcard characters '*' and '?'."),this); - //l->setAlignment(AlignCenter); + //l->setAlignment(Qt::AlignCenter); g->addMultiCellWidget(l,0,0,0,1); KviTalHBox * b = new KviTalHBox(this); @@ -213,29 +213,29 @@ KviReguserMaskDialog::KviReguserMaskDialog(QWidget * p,KviIrcMask * m) m_pNickEdit = new QLineEdit(b); //m_pNickEdit->setMinimumWidth(120); - m_pNickEdit->setAlignment(AlignRight); + m_pNickEdit->setAlignment(Qt::AlignRight); #ifdef COMPILE_INFO_TIPS QToolTip::add(m_pNickEdit,__tr2qs("<center>This the <b>nickname</b> that will match this user, default value is the registered name.</center>")); #endif l = new QLabel("<center><b>!</b></center>",b); - l->setAlignment(AlignCenter); + l->setAlignment(Qt::AlignCenter); //l->setMinimumWidth(40); m_pUserEdit = new QLineEdit(b); //m_pUserEdit->setMinimumWidth(120); - m_pUserEdit->setAlignment(AlignCenter); + m_pUserEdit->setAlignment(Qt::AlignCenter); #ifdef COMPILE_INFO_TIPS QToolTip::add(m_pUserEdit,__tr2qs("<center>This the <b>username</b> that will match this user. <b>*</b> will match any username.</center>")); #endif l = new QLabel("<center><b>@</b></center>",b); - l->setAlignment(AlignCenter); + l->setAlignment(Qt::AlignCenter); //l->setMinimumWidth(40); m_pHostEdit = new QLineEdit(b); //m_pHostEdit->setMinimumWidth(120); - m_pHostEdit->setAlignment(AlignLeft); + m_pHostEdit->setAlignment(Qt::AlignLeft); #ifdef COMPILE_INFO_TIPS QToolTip::add(m_pHostEdit,__tr2qs("<center>This the <b>hostname</b> that will match this user. <b>*</b> will match any hostname.</center>")); #endif @@ -301,7 +301,7 @@ void KviReguserMaskDialog::okClicked() KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegisteredUser * r,bool bModal) -: QTabDialog(p,"reguser_entry_editor",bModal) +: KviTalTabDialog(p,"reguser_entry_editor",bModal) { m_pUser = r; m_pCustomColor = new QColor(); diff --git a/src/modules/reguser/edituser.h b/src/modules/reguser/edituser.h index 5fa2af4be..9bf37c8ab 100644 --- a/src/modules/reguser/edituser.h +++ b/src/modules/reguser/edituser.h @@ -34,7 +34,7 @@ #include "kvi_tal_listview.h" #include "kvi_tal_listbox.h" #include "kvi_dict.h" -#include <qtabdialog.h> +#include <kvi_tal_tabdialog.h> #include <qtable.h> #include "kvi_tal_popupmenu.h" @@ -133,7 +133,7 @@ public: }; -class KviRegisteredUserEntryDialog : public QTabDialog +class KviRegisteredUserEntryDialog : public KviTalTabDialog { Q_OBJECT public: diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp index 2854b7b13..545f36242 100644 --- a/src/modules/reguser/wizard.cpp +++ b/src/modules/reguser/wizard.cpp @@ -46,7 +46,7 @@ extern KVIRC_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase; extern KviPtrList<KviRegistrationWizard> * g_pRegistrationWizardList; KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegisteredUserDataBase * db,QWidget * par,bool bModal) -: QWizard(par,"regusers_wizard",bModal) +: KviTalWizard(par,"regusers_wizard",bModal) { m_pDb = db; @@ -269,7 +269,7 @@ KviRegistrationWizard::~KviRegistrationWizard() void KviRegistrationWizard::reject() { - QWizard::reject(); + KviTalWizard::reject(); if(!m_bModal)delete this; // hide(); // g_pApp->collectGarbage(this); @@ -277,7 +277,7 @@ void KviRegistrationWizard::reject() void KviRegistrationWizard::accept() { - QWizard::accept(); + KviTalWizard::accept(); bool bLocalDb = true; if(!m_pDb) { @@ -387,7 +387,7 @@ void KviRegistrationWizard::showEvent(QShowEvent *e) { if(height() < 420)resize(width(),420); move((g_pApp->desktop()->width() - width())/2,(g_pApp->desktop()->height() - height())/2); - QWizard::showEvent(e); + KviTalWizard::showEvent(e); } void KviRegistrationWizard::maskChanged(const QString &) diff --git a/src/modules/reguser/wizard.h b/src/modules/reguser/wizard.h index 0b97c3bcf..1ddbe0ba8 100644 --- a/src/modules/reguser/wizard.h +++ b/src/modules/reguser/wizard.h @@ -24,7 +24,7 @@ #include "kvi_string.h" -#include <qwizard.h> +#include <kvi_tal_wizard.h> class KviPixmap; class KviPixmapSelector; @@ -37,7 +37,7 @@ class QLineEdit; class QWidget; class KviRegisteredUserDataBase; -class KviRegistrationWizard : public QWizard +class KviRegistrationWizard : public KviTalWizard { Q_OBJECT public: diff --git a/src/modules/rijndael/libkvirijndael.h b/src/modules/rijndael/libkvirijndael.h index f6b7cd454..c3fd880a8 100644 --- a/src/modules/rijndael/libkvirijndael.h +++ b/src/modules/rijndael/libkvirijndael.h @@ -153,7 +153,7 @@ KviStr m_szDecryptKey; bool m_bDecryptCBC; public: - virtual bool isCryptographicEngine(){ return false; }; // we need to return false since it doesn't use the CTRL+P escape + virtual bool isCryptographicEngine(){ return false; }; // we need to return false since it doesn't use the Qt::CTRL+P escape virtual bool init(const char *encKey,int encKeyLen,const char *decKey,int decKeyLen); virtual KviCryptEngine::EncryptResult encrypt(const char * plainText,KviStr &outBuffer); virtual KviCryptEngine::DecryptResult decrypt(const char * inBuffer,KviStr &plainText); diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp index 475debf85..d1bd90d32 100644 --- a/src/modules/setup/setupwizard.cpp +++ b/src/modules/setup/setupwizard.cpp @@ -36,7 +36,7 @@ #include "kvi_options.h" #include "kvi_config.h" -#include <qtextedit.h> +#include <kvi_tal_textedit.h> #include <qmessagebox.h> #include <qdir.h> #include <qpushbutton.h> @@ -70,12 +70,12 @@ extern QString szUrl; KviSetupPage::KviSetupPage(KviSetupWizard * w) : KviTalHBox(w) { - // we need this to set localized text on buttons (see QT doc/ QWizard class) - w->QWizard::backButton()->setText(__tr2qs("< &Back")); - w->QWizard::nextButton()->setText(__tr2qs("&Next >")); - w->QWizard::finishButton()->setText(__tr2qs("Finish")); - w->QWizard::cancelButton()->setText(__tr2qs("Cancel")); - //w->QWizard::helpButton()->setText(__tr2qs("Help")); + // we need this to set localized text on buttons (see QT doc/ KviTalWizard class) + w->KviTalWizard::backButton()->setText(__tr2qs("< &Back")); + w->KviTalWizard::nextButton()->setText(__tr2qs("&Next >")); + w->KviTalWizard::finishButton()->setText(__tr2qs("Finish")); + w->KviTalWizard::cancelButton()->setText(__tr2qs("Cancel")); + //w->KviTalWizard::helpButton()->setText(__tr2qs("Help")); setSpacing(8); @@ -107,7 +107,7 @@ KviSetupPage::~KviSetupPage() KviSetupWizard::KviSetupWizard() -: QWizard(0,0,true) +: KviTalWizard(0,0,true) { QString szLabelText; @@ -167,9 +167,9 @@ KviSetupWizard::KviSetupWizard() "</ul></p>" \ "<p>The \"legalese\" version of the license is shown in the box below.</p>")); - QTextEdit * ed = new QTextEdit(m_pLicense->m_pVBox); + KviTalTextEdit * ed = new KviTalTextEdit(m_pLicense->m_pVBox); ed->setReadOnly(true); - ed->setWordWrap(QTextEdit::NoWrap); + ed->setWordWrap(KviTalTextEdit::NoWrap); QString szLicense; QString szLicensePath; g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"COPYING"); @@ -784,7 +784,7 @@ void KviSetupWizard::reject() __tr2qs("You have chosen to abort the setup.<br>KVIrc cannot run until you complete this procedure.<br><br>Do you really wish to abort?"), QMessageBox::Yes,QMessageBox::No|QMessageBox::Default|QMessageBox::Escape) != QMessageBox::Yes)return; - QWizard::reject(); + KviTalWizard::reject(); } void KviSetupWizard::accept() @@ -969,7 +969,7 @@ void KviSetupWizard::accept() #ifdef COMPILE_ON_WINDOWS } #endif - QWizard::accept(); + KviTalWizard::accept(); } #include "setupwizard.moc" diff --git a/src/modules/setup/setupwizard.h b/src/modules/setup/setupwizard.h index 6d09e9840..476e969bf 100644 --- a/src/modules/setup/setupwizard.h +++ b/src/modules/setup/setupwizard.h @@ -23,7 +23,7 @@ // -#include <qwizard.h> +#include <kvi_tal_wizard.h> #include "kvi_tal_vbox.h" #include "kvi_tal_hbox.h" #include "kvi_tal_groupbox.h" @@ -59,7 +59,7 @@ public: #define THEME_APPLY_HIRES 1 #define THEME_APPLY_LORES 2 -class KviSetupWizard : public QWizard +class KviSetupWizard : public KviTalWizard { Q_OBJECT public: diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp index a3c004c34..4b0150731 100644 --- a/src/modules/theme/managementdialog.cpp +++ b/src/modules/theme/managementdialog.cpp @@ -41,7 +41,7 @@ #include <qpushbutton.h> #include "kvi_tal_listbox.h" #include <qlineedit.h> -#include <qtextedit.h> +#include <kvi_tal_textedit.h> #include <qregexp.h> #include <qmessagebox.h> #include <qdir.h> @@ -53,7 +53,7 @@ #include <qpainter.h> #include <qtooltip.h> #include <qimage.h> -#include <qtextedit.h> +#include <kvi_tal_textedit.h> #include <qmultilineedit.h> #include <qbuffer.h> diff --git a/src/modules/theme/managementdialog.h b/src/modules/theme/managementdialog.h index ef2fc37ec..7f363618e 100644 --- a/src/modules/theme/managementdialog.h +++ b/src/modules/theme/managementdialog.h @@ -34,11 +34,11 @@ #include <qcombobox.h> #include "kvi_tal_popupmenu.h" #include <qcursor.h> -#include <qwizard.h> +#include <kvi_tal_wizard.h> class QLineEdit; -class QTextEdit; +class KviTalTextEdit; class QPushButton; class QLabel; class QCheckBox; diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp index 0efeb8bf5..43f80fa89 100644 --- a/src/modules/theme/packthemedialog.cpp +++ b/src/modules/theme/packthemedialog.cpp @@ -35,7 +35,7 @@ #include <qpainter.h> #include <qtooltip.h> #include <qimage.h> -#include <qtextedit.h> +#include <kvi_tal_textedit.h> #include <qmultilineedit.h> #include <qbuffer.h> #include <qlabel.h> @@ -61,7 +61,7 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPtrList<KviThemeInfo> * pThemeInfoList) -: QWizard(pParent) +: KviTalWizard(pParent) { m_pThemeInfoList = pThemeInfoList; @@ -188,7 +188,7 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPtrList<KviThemeInfo szThemesDescription += "</body></html>"; - QTextEdit * pTextEdit = new QTextEdit(pPage); + KviTalTextEdit * pTextEdit = new KviTalTextEdit(pPage); pTextEdit->setPaper(QBrush(QColor(255,255,255))); pTextEdit->setReadOnly(true); pTextEdit->setText(szThemesDescription); @@ -231,7 +231,7 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPtrList<KviThemeInfo pLabel->setText(__tr2qs_ctx("Description:","theme")); pLayout->addWidget(pLabel,3,0); - m_pPackageDescriptionEdit = new QTextEdit(pPage); + m_pPackageDescriptionEdit = new KviTalTextEdit(pPage); m_pPackageDescriptionEdit->setText(szPackageDescription); pLayout->addWidget(m_pPackageDescriptionEdit,3,1); @@ -346,7 +346,7 @@ void KviPackThemeDialog::imageSelectionChanged(const QString &szImagePath) void KviPackThemeDialog::accept() { if(!packTheme())return; - QWizard::accept(); + KviTalWizard::accept(); } diff --git a/src/modules/theme/packthemedialog.h b/src/modules/theme/packthemedialog.h index b3916dab6..083d42f39 100644 --- a/src/modules/theme/packthemedialog.h +++ b/src/modules/theme/packthemedialog.h @@ -29,16 +29,16 @@ #include "kvi_theme.h" #include <qdialog.h> -#include <qwizard.h> +#include <kvi_tal_wizard.h> class QLineEdit; -class QTextEdit; +class KviTalTextEdit; class QLabel; class QMultiLineEdit; class KviFileSelector; -class KviPackThemeDialog : public QWizard +class KviPackThemeDialog : public KviTalWizard { Q_OBJECT public: @@ -52,7 +52,7 @@ protected: QLabel * m_pImageLabel; KviPtrList<KviThemeInfo> * m_pThemeInfoList; QLineEdit * m_pPackageNameEdit; - QTextEdit * m_pPackageDescriptionEdit; + KviTalTextEdit * m_pPackageDescriptionEdit; QLineEdit * m_pPackageVersionEdit; QLineEdit * m_pPackagerNameEdit; QWidget * m_pImageSelectionPage; diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp index 6e187fdb7..b40620c54 100644 --- a/src/modules/theme/savethemedialog.cpp +++ b/src/modules/theme/savethemedialog.cpp @@ -35,7 +35,7 @@ #include <qpainter.h> #include <qtooltip.h> #include <qimage.h> -#include <qtextedit.h> +#include <kvi_tal_textedit.h> #include <qmultilineedit.h> #include <qbuffer.h> #include <qlabel.h> @@ -60,7 +60,7 @@ KviSaveThemeDialog::KviSaveThemeDialog(QWidget * pParent) -: QWizard(pParent) +: KviTalWizard(pParent) { setCaption(__tr2qs_ctx("Save Current Theme - KVIrc","theme")); setMinimumSize(400,350); @@ -118,7 +118,7 @@ KviSaveThemeDialog::KviSaveThemeDialog(QWidget * pParent) pLabel->setText(__tr2qs_ctx("Description:","theme")); pLayout->addWidget(pLabel,3,0); - m_pThemeDescriptionEdit = new QTextEdit(pPage); + m_pThemeDescriptionEdit = new KviTalTextEdit(pPage); //m_pThemeDescriptionEdit->setText(szThemeDescription); pLayout->addWidget(m_pThemeDescriptionEdit,3,1); @@ -205,7 +205,7 @@ void KviSaveThemeDialog::imageSelectionChanged(const QString &szImagePath) void KviSaveThemeDialog::accept() { if(!saveTheme())return; - QWizard::accept(); + KviTalWizard::accept(); } diff --git a/src/modules/theme/savethemedialog.h b/src/modules/theme/savethemedialog.h index 5e780f750..0e26ce44b 100644 --- a/src/modules/theme/savethemedialog.h +++ b/src/modules/theme/savethemedialog.h @@ -29,11 +29,11 @@ #include "kvi_theme.h" #include <qdialog.h> -#include <qwizard.h> +#include <kvi_tal_wizard.h> class QLineEdit; -class QTextEdit; +class KviTalTextEdit; class QPushButton; class QCheckBox; class QLabel; @@ -41,7 +41,7 @@ class QMultiLineEdit; class KviFileSelector; -class KviSaveThemeDialog : public QWizard +class KviSaveThemeDialog : public KviTalWizard { Q_OBJECT public: @@ -52,7 +52,7 @@ protected: KviFileSelector * m_pImageSelector; QLabel * m_pImageLabel; QLineEdit * m_pThemeNameEdit; - QTextEdit * m_pThemeDescriptionEdit; + KviTalTextEdit * m_pThemeDescriptionEdit; QLineEdit * m_pThemeVersionEdit; QLineEdit * m_pAuthorNameEdit; QWidget * m_pImageSelectionPage; diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp index 895749e01..b979f9b8a 100644 --- a/src/modules/toolbareditor/toolbareditor.cpp +++ b/src/modules/toolbareditor/toolbareditor.cpp @@ -59,7 +59,7 @@ KviTrashcanLabel::KviTrashcanLabel(QWidget * p) QToolTip::add(this,__tr2qs("Drop here the icons from the toolbars to remove them")); setFrameStyle(QFrame::Sunken | QFrame::WinPanel); setAcceptDrops(true); - setAlignment(AlignCenter); + setAlignment(Qt::AlignCenter); setMinimumSize(40,40); m_uFlashCount = 0; m_pFlashTimer = 0; |