From 0a80cfd57d271dd44221467efb426675fa470356 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 28 Jun 2011 18:31:12 +0000 Subject: TQt4 port kvirc This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1238719 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/modules/toolbareditor/libkvitoolbareditor.cpp | 8 +- src/modules/toolbareditor/toolbareditor.cpp | 194 +++++++++++----------- src/modules/toolbareditor/toolbareditor.h | 79 ++++----- 3 files changed, 142 insertions(+), 139 deletions(-) (limited to 'src/modules/toolbareditor') diff --git a/src/modules/toolbareditor/libkvitoolbareditor.cpp b/src/modules/toolbareditor/libkvitoolbareditor.cpp index b4f9e258..4cfa80ed 100644 --- a/src/modules/toolbareditor/libkvitoolbareditor.cpp +++ b/src/modules/toolbareditor/libkvitoolbareditor.cpp @@ -32,7 +32,7 @@ #include "kvi_config.h" #include "kvi_app.h" -QRect g_rectToolBarEditorDialogGeometry(0,0,0,0); +TQRect g_rectToolBarEditorDialogGeometry(0,0,0,0); /* @doc: toolbareditor.open @@ -58,10 +58,10 @@ static bool toolbareditor_kvs_cmd_open(KviKvsModuleCommandCall * c) static bool toolbareditor_module_init(KviModule * m) { KVSM_REGISTER_SIMPLE_COMMAND(m,"open",toolbareditor_kvs_cmd_open); - QString szBuf; + TQString szBuf; m->getDefaultConfigFileName(szBuf); KviConfig cfg(szBuf,KviConfig::Read); - g_rectToolBarEditorDialogGeometry = cfg.readRectEntry("EditorGeometry",QRect(10,10,390,440)); + g_rectToolBarEditorDialogGeometry = cfg.readRectEntry("EditorGeometry",TQRect(10,10,390,440)); return true; @@ -76,7 +76,7 @@ static bool toolbareditor_module_cleanup(KviModule *m) { KviCustomizeToolBarsDialog::cleanup(); - QString szBuf; + TQString szBuf; m->getDefaultConfigFileName(szBuf); KviConfig cfg(szBuf,KviConfig::Write); cfg.writeEntry("EditorGeometry",g_rectToolBarEditorDialogGeometry); diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp index 5b00f47a..d80d8844 100644 --- a/src/modules/toolbareditor/toolbareditor.cpp +++ b/src/modules/toolbareditor/toolbareditor.cpp @@ -36,37 +36,37 @@ #include "kvi_kvs_useraction.h" #include "kvi_draganddrop.h" -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include KviCustomizeToolBarsDialog * KviCustomizeToolBarsDialog::m_pInstance = 0; -extern QRect g_rectToolBarEditorDialogGeometry; +extern TQRect g_rectToolBarEditorDialogGeometry; -KviTrashcanLabel::KviTrashcanLabel(QWidget * p) -: QLabel(p) +KviTrashcanLabel::KviTrashcanLabel(TQWidget * p) +: TQLabel(p) { setPixmap(*(g_pIconManager->getBigIcon("kvi_bigicon_trashcan.png"))); - QToolTip::add(this,__tr2qs("Drop here the icons from the toolbars to remove them")); - setFrameStyle(QFrame::Sunken | QFrame::WinPanel); + TQToolTip::add(this,__tr2qs("Drop here the icons from the toolbars to remove them")); + setFrameStyle(TQFrame::Sunken | TQFrame::WinPanel); setAcceptDrops(true); - setAlignment(Qt::AlignCenter); + tqsetAlignment(TQt::AlignCenter); setMinimumSize(40,40); m_uFlashCount = 0; m_pFlashTimer = 0; m_clrOriginal = paletteBackgroundColor(); - connect(KviActionManager::instance(),SIGNAL(removeActionsHintRequest()),this,SLOT(flash())); + connect(KviActionManager::instance(),TQT_SIGNAL(removeActionsHintRequest()),this,TQT_SLOT(flash())); } KviTrashcanLabel::~KviTrashcanLabel() @@ -82,8 +82,8 @@ void KviTrashcanLabel::flash() { m_uFlashCount = 0; if(m_pFlashTimer)return; - m_pFlashTimer = new QTimer(); - connect(m_pFlashTimer,SIGNAL(timeout()),this,SLOT(heartbeat())); + m_pFlashTimer = new TQTimer(); + connect(m_pFlashTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(heartbeat())); m_pFlashTimer->start(200); } @@ -91,7 +91,7 @@ void KviTrashcanLabel::heartbeat() { m_uFlashCount++; if(m_uFlashCount % 2) - setPaletteBackgroundColor(QColor(0,0,0)); + setPaletteBackgroundColor(TQColor(0,0,0)); else setPaletteBackgroundColor(m_clrOriginal); update(); @@ -103,23 +103,23 @@ void KviTrashcanLabel::heartbeat() } } -void KviTrashcanLabel::dropEvent(QDropEvent * e) +void KviTrashcanLabel::dropEvent(TQDropEvent * e) { if(KviTextDrag::canDecode(e)) e->accept(); } -void KviTrashcanLabel::dragEnterEvent(QDragEnterEvent * e) +void KviTrashcanLabel::dragEnterEvent(TQDragEnterEvent * e) { - QString s; + TQString s; if(KviTextDrag::decode(e,s)) e->accept(); } -KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(QWidget * p,const QString &szText,const QString &szId,const QString &szLabel,const QString &szIconId) -: QDialog(p) +KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(TQWidget * p,const TQString &szText,const TQString &szId,const TQString &szLabel,const TQString &szIconId) +: TQDialog(p) { m_szId = szId; m_szOriginalId = szId; @@ -128,40 +128,40 @@ KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(QWidget * p,c setCaption(__tr2qs("ToolBar Properties")); setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TOOLBAR))); - QGridLayout * g = new QGridLayout(this,5,6,5,3); + TQGridLayout * g = new TQGridLayout(this,5,6,5,3); - QLabel * l = new QLabel(szText,this); + TQLabel * l = new TQLabel(szText,this); g->addMultiCellWidget(l,0,0,0,5); - l = new QLabel(__tr2qs("Label") + ":",this); + l = new TQLabel(__tr2qs("Label") + ":",this); g->addWidget(l,1,0); - m_pLabelEdit = new QLineEdit(this); + m_pLabelEdit = new TQLineEdit(this); g->addMultiCellWidget(m_pLabelEdit,1,1,1,5); m_pLabelEdit->setText(szLabel); - connect(m_pLabelEdit,SIGNAL(textChanged(const QString &)),this,SLOT(labelTextChanged(const QString &))); + connect(m_pLabelEdit,TQT_SIGNAL(textChanged(const TQString &)),this,TQT_SLOT(labelTextChanged(const TQString &))); - l = new QLabel(__tr2qs("Icon") + ":",this); + l = new TQLabel(__tr2qs("Icon") + ":",this); g->addWidget(l,2,0); - m_pIconEdit = new QLineEdit(this); + m_pIconEdit = new TQLineEdit(this); m_pIconEdit->setReadOnly(true); g->addMultiCellWidget(m_pIconEdit,2,2,1,4); - m_pIconButton = new QPushButton(this); + m_pIconButton = new TQPushButton(this); g->addMultiCellWidget(m_pIconButton,2,2,5,5); - connect(m_pIconButton,SIGNAL(clicked()),this,SLOT(iconButtonClicked())); + connect(m_pIconButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(iconButtonClicked())); iconSelected(szIconId); - m_pAdvanced = new QWidget(this); - QGridLayout * ag = new QGridLayout(m_pAdvanced,1,2,0,3); + m_pAdvanced = new TQWidget(this); + TQGridLayout * ag = new TQGridLayout(m_pAdvanced,1,2,0,3); - l = new QLabel(__tr2qs("Id") + ":",m_pAdvanced); + l = new TQLabel(__tr2qs("Id") + ":",m_pAdvanced); l->setMinimumWidth(100); ag->addWidget(l,0,0); - m_pIdEdit = new QLineEdit(m_pAdvanced); + m_pIdEdit = new TQLineEdit(m_pAdvanced); ag->addWidget(m_pIdEdit,0,1); ag->setRowStretch(0,1); @@ -172,18 +172,18 @@ KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(QWidget * p,c m_pLabelEdit->setFocus(); - QPushButton * pb = new QPushButton(__tr2qs("OK"),this); - connect(pb,SIGNAL(clicked()),this,SLOT(okClicked())); + TQPushButton * pb = new TQPushButton(__tr2qs("OK"),this); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(okClicked())); pb->setMinimumWidth(80); g->addMultiCellWidget(pb,4,4,4,5); - pb = new QPushButton(__tr2qs("Cancel"),this); - connect(pb,SIGNAL(clicked()),this,SLOT(reject())); + pb = new TQPushButton(__tr2qs("Cancel"),this); + connect(pb,TQT_SIGNAL(clicked()),this,TQT_SLOT(reject())); pb->setMinimumWidth(80); g->addWidget(pb,4,3); - m_pAdvancedButton = new QPushButton(__tr2qs("Advanced..."),this); - connect(m_pAdvancedButton,SIGNAL(clicked()),this,SLOT(advancedClicked())); + m_pAdvancedButton = new TQPushButton(__tr2qs("Advanced..."),this); + connect(m_pAdvancedButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(advancedClicked())); m_pAdvancedButton->setMinimumWidth(100); g->addMultiCellWidget(m_pAdvancedButton,4,4,0,1); @@ -197,9 +197,9 @@ KviCustomToolBarPropertiesDialog::~KviCustomToolBarPropertiesDialog() { } -void KviCustomToolBarPropertiesDialog::iconSelected(const QString &szIconId) +void KviCustomToolBarPropertiesDialog::iconSelected(const TQString &szIconId) { - QPixmap * p = g_pIconManager->getImage(szIconId.utf8().data()); + TQPixmap * p = g_pIconManager->getImage(szIconId.utf8().data()); if(p) { m_pIconButton->setPixmap(*p); @@ -215,22 +215,22 @@ void KviCustomToolBarPropertiesDialog::iconSelected(const QString &szIconId) void KviCustomToolBarPropertiesDialog::iconButtonClicked() { KviImageDialog * dlg = new KviImageDialog(this,__tr2qs("Please choose the icon for the ToolBar")); - if(dlg->exec() != QDialog::Accepted) + if(dlg->exec() != TQDialog::Accepted) { delete dlg; return; } - QString s = dlg->selectedImage(); + TQString s = dlg->selectedImage(); delete dlg; iconSelected(s); } -void KviCustomToolBarPropertiesDialog::labelTextChanged(const QString &s) +void KviCustomToolBarPropertiesDialog::labelTextChanged(const TQString &s) { if(m_szOriginalId.isEmpty()) { - QString szId = KviCustomToolBarManager::instance()->idForNewToolBar(s); + TQString szId = KviCustomToolBarManager::instance()->idForNewToolBar(s); m_pIdEdit->setText(szId); } } @@ -240,7 +240,7 @@ void KviCustomToolBarPropertiesDialog::okClicked() { if(m_szLabel.isEmpty()) { - QMessageBox::information(this,__tr2qs("Invalid ToolBar Label"),__tr2qs("The ToolBar Label can't be empty!"),__tr2qs("OK")); + TQMessageBox::information(this,__tr2qs("Invalid ToolBar Label"),__tr2qs("The ToolBar Label can't be empty!"),__tr2qs("OK")); return; } @@ -249,11 +249,11 @@ void KviCustomToolBarPropertiesDialog::okClicked() m_szId = KviCustomToolBarManager::instance()->idForNewToolBar(m_szLabel); } - if(KviCustomToolBarManager::instance()->find(m_szId)) + if(KviCustomToolBarManager::instance()->tqfind(m_szId)) { if(m_szId != m_szOriginalId) { - if(QMessageBox::information(this,__tr2qs("Duplicate ToolBar Id"), + if(TQMessageBox::information(this,__tr2qs("Duplicate ToolBar Id"), __tr2qs("The specified ToolBar Id already exists.
" \ "Would you like KVIrc to assign it automatically (so it doesn't " "collide with any other toolbar) or you prefer to do it manually ?"), @@ -281,43 +281,43 @@ void KviCustomToolBarPropertiesDialog::advancedClicked() } -KviCustomizeToolBarsDialog::KviCustomizeToolBarsDialog(QWidget * p) -: QDialog(p,"" /*,WType_TopLevel | WStyle_Customize | WStyle_Title | WStyle_StaysOnTop | WStyle_DialogBorder*/) +KviCustomizeToolBarsDialog::KviCustomizeToolBarsDialog(TQWidget * p) +: TQDialog(p,"" /*,WType_TopLevel | WStyle_Customize | WStyle_Title | WStyle_StaysOnTop | WStyle_DialogBorder*/) { setCaption(__tr2qs("Customize Toolbars")); setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TOOLBAR))); m_pInstance = this; - QGridLayout * g = new QGridLayout(this,8,2,4,5); + TQGridLayout * g = new TQGridLayout(this,8,2,4,5); m_pDrawer = new KviActionDrawer(this); g->addMultiCellWidget(m_pDrawer,0,6,0,0); - QPushButton * b = new QPushButton(__tr2qs("New ToolBar"),this); - connect(b,SIGNAL(clicked()),this,SLOT(newToolBar())); + TQPushButton * b = new TQPushButton(__tr2qs("New ToolBar"),this); + connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(newToolBar())); g->addWidget(b,0,1); - m_pDeleteToolBarButton = new QPushButton(__tr2qs("Delete ToolBar"),this); - connect(m_pDeleteToolBarButton,SIGNAL(clicked()),this,SLOT(deleteToolBar())); + m_pDeleteToolBarButton = new TQPushButton(__tr2qs("Delete ToolBar"),this); + connect(m_pDeleteToolBarButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(deleteToolBar())); g->addWidget(m_pDeleteToolBarButton,1,1); - m_pRenameToolBarButton = new QPushButton(__tr2qs("Edit ToolBar"),this); - connect(m_pRenameToolBarButton,SIGNAL(clicked()),this,SLOT(renameToolBar())); + m_pRenameToolBarButton = new TQPushButton(__tr2qs("Edit ToolBar"),this); + connect(m_pRenameToolBarButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(renameToolBar())); g->addWidget(m_pRenameToolBarButton,2,1); - QFrame * f = new QFrame(this); - f->setFrameStyle(QFrame::HLine | QFrame::Sunken); + TQFrame * f = new TQFrame(this); + f->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); g->addWidget(f,3,1); - m_pExportToolBarButton = new QPushButton(__tr2qs("Export ToolBar"),this); - connect(m_pExportToolBarButton,SIGNAL(clicked()),this,SLOT(exportToolBar())); + m_pExportToolBarButton = new TQPushButton(__tr2qs("Export ToolBar"),this); + connect(m_pExportToolBarButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(exportToolBar())); g->addWidget(m_pExportToolBarButton,4,1); KviTrashcanLabel * t = new KviTrashcanLabel(this); g->addWidget(t,6,1); - b = new QPushButton(__tr2qs("Close"),this); - connect(b,SIGNAL(clicked()),this,SLOT(closeClicked())); + b = new TQPushButton(__tr2qs("Close"),this); + connect(b,TQT_SIGNAL(clicked()),this,TQT_SLOT(closeClicked())); g->addWidget(b,7,1); g->setRowStretch(5,1); @@ -325,7 +325,7 @@ KviCustomizeToolBarsDialog::KviCustomizeToolBarsDialog(QWidget * p) m_pDrawer->fill(); - connect(KviActionManager::instance(),SIGNAL(currentToolBarChanged()),this,SLOT(currentToolBarChanged())); + connect(KviActionManager::instance(),TQT_SIGNAL(currentToolBarChanged()),this,TQT_SLOT(currentToolBarChanged())); KviActionManager::instance()->customizeToolBarsDialogCreated(); currentToolBarChanged(); @@ -343,7 +343,7 @@ KviCustomizeToolBarsDialog::KviCustomizeToolBarsDialog(QWidget * p) KviCustomizeToolBarsDialog::~KviCustomizeToolBarsDialog() { - g_rectToolBarEditorDialogGeometry = QRect(pos().x(),pos().y(),size().width(),size().height()); + g_rectToolBarEditorDialogGeometry = TQRect(pos().x(),pos().y(),size().width(),size().height()); KviActionManager::instance()->customizeToolBarsDialogDestroyed(); m_pInstance = 0; @@ -355,10 +355,10 @@ void KviCustomizeToolBarsDialog::currentToolBarChanged() m_pRenameToolBarButton->setEnabled(KviActionManager::instance()->currentToolBar()); } -void KviCustomizeToolBarsDialog::showEvent(QShowEvent * e) +void KviCustomizeToolBarsDialog::showEvent(TQShowEvent * e) { -// repaintContents(); -// QRect r = parentWidget() ? parentWidget()->rect() : QApplication::desktop()->rect(); +// tqrepaintContents(); +// TQRect r = tqparentWidget() ? tqparentWidget()->rect() : TQApplication::desktop()->rect(); // int x = (r.width() - width()) / 2; // int y = (r.height() - height()) / 2; // move(x,y); @@ -369,9 +369,9 @@ void KviCustomizeToolBarsDialog::deleteToolBar() { KviCustomToolBar * t = KviActionManager::currentToolBar(); if(!t)return; - if(QMessageBox::question(this, + if(TQMessageBox::question(this, __tr2qs("Confirm ToolBar Deletion"), - __tr2qs("Do you really want to delete toolbar \"%1\" ?").arg(t->label()), + __tr2qs("Do you really want to delete toolbar \"%1\" ?").tqarg(t->label()), __tr2qs("No"), __tr2qs("Yes")) == 0)return; KviCustomToolBarManager::instance()->destroyDescriptor(t->descriptor()->id()); @@ -382,18 +382,18 @@ void KviCustomizeToolBarsDialog::exportToolBar() KviCustomToolBar * t = KviActionManager::currentToolBar(); if(!t)return; - QString szName = QDir::homeDirPath(); - if(!szName.endsWith(QString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR; + TQString szName = TQDir::homeDirPath(); + if(!szName.endsWith(TQString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR; szName += t->descriptor()->id(); szName += ".kvs"; - QString szFile; + TQString szFile; if(!KviFileDialog::askForSaveFileName(szFile,__tr2qs("Choose a Filename - KVIrc"),szName,"*.kvs",true,true,true))return; - QString szCode; + TQString szCode; - int ret = QMessageBox::question(this, + int ret = TQMessageBox::question(this, __tr2qs("ToolBar Export"), __tr2qs("Do you want the associated actions to be exported with the toolbar ?"), __tr2qs("Yes"), @@ -406,10 +406,10 @@ void KviCustomizeToolBarsDialog::exportToolBar() if(bExportActions) { - KviPointerList * a = t->descriptor()->actions(); + KviPointerList * a = t->descriptor()->actions(); if(a) { - for(QString * s = a->first();s;s = a->next()) + for(TQString * s = a->first();s;s = a->next()) { KviAction * act = KviActionManager::instance()->getAction(*s); if(act) @@ -432,10 +432,10 @@ void KviCustomizeToolBarsDialog::exportToolBar() szCode += t->descriptor()->iconId(); szCode += "\n"; - KviPointerList * aa = t->descriptor()->actions(); + KviPointerList * aa = t->descriptor()->actions(); if(aa) { - for(QString * ss = aa->first();ss;ss = aa->next()) + for(TQString * ss = aa->first();ss;ss = aa->next()) { szCode += "toolbar.additem "; szCode += t->descriptor()->id(); @@ -451,7 +451,7 @@ void KviCustomizeToolBarsDialog::exportToolBar() if(!KviFileUtils::writeFile(szFile,szCode)) { - QMessageBox::warning(this,__tr2qs("Write Failed - KVIrc"),__tr2qs("Unable to write to the toolbar file."),__tr2qs("OK")); + TQMessageBox::warning(this,__tr2qs("Write Failed - KVIrc"),__tr2qs("Unable to write to the toolbar file."),__tr2qs("OK")); } } @@ -462,21 +462,21 @@ void KviCustomizeToolBarsDialog::renameToolBar() if(!t)return; KviCustomToolBarPropertiesDialog * dlg = new KviCustomToolBarPropertiesDialog(this, - __tr2qs("Please specify the properties for the toolbar \"%1\"").arg(t->label()), + __tr2qs("Please specify the properties for the toolbar \"%1\"").tqarg(t->label()), t->descriptor()->id(), t->descriptor()->labelCode(), t->descriptor()->iconId()); dlg->show(); - if(dlg->exec() != QDialog::Accepted) + if(dlg->exec() != TQDialog::Accepted) { delete dlg; return; } - QString id = dlg->id(); - QString label = dlg->label(); - QString icon = dlg->iconId(); + TQString id = dlg->id(); + TQString label = dlg->label(); + TQString icon = dlg->iconId(); delete dlg; if((id == t->descriptor()->id()) && (label == t->descriptor()->labelCode()) && (icon == t->descriptor()->iconId()))return; @@ -493,15 +493,15 @@ void KviCustomizeToolBarsDialog::newToolBar() __tr2qs("My ToolBar")); dlg->show(); - if(dlg->exec() != QDialog::Accepted) + if(dlg->exec() != TQDialog::Accepted) { delete dlg; return; } - QString id = dlg->id(); - QString label = dlg->label(); - QString icon = dlg->iconId(); + TQString id = dlg->id(); + TQString label = dlg->label(); + TQString icon = dlg->iconId(); delete dlg; KviCustomToolBarDescriptor * d = KviCustomToolBarManager::instance()->create(id,label); @@ -529,7 +529,7 @@ void KviCustomizeToolBarsDialog::display() m_pInstance->show(); } -void KviCustomizeToolBarsDialog::closeEvent(QCloseEvent * e) +void KviCustomizeToolBarsDialog::closeEvent(TQCloseEvent * e) { e->ignore(); delete this; diff --git a/src/modules/toolbareditor/toolbareditor.h b/src/modules/toolbareditor/toolbareditor.h index 2c44178c..ea2f5252 100644 --- a/src/modules/toolbareditor/toolbareditor.h +++ b/src/modules/toolbareditor/toolbareditor.h @@ -25,34 +25,35 @@ //============================================================================= #include "kvi_settings.h" -#include -#include -#include -#include +#include +#include +#include +#include -class QPushButton; +class TQPushButton; class KviActionDrawer; -class KviCustomizeToolBarsDialog : public QDialog +class KviCustomizeToolBarsDialog : public TQDialog { Q_OBJECT + TQ_OBJECT protected: - KviCustomizeToolBarsDialog(QWidget * p); + KviCustomizeToolBarsDialog(TQWidget * p); public: ~KviCustomizeToolBarsDialog(); protected: KviActionDrawer * m_pDrawer; static KviCustomizeToolBarsDialog * m_pInstance; - QPushButton * m_pDeleteToolBarButton; - QPushButton * m_pRenameToolBarButton; - QPushButton * m_pExportToolBarButton; + TQPushButton * m_pDeleteToolBarButton; + TQPushButton * m_pRenameToolBarButton; + TQPushButton * m_pExportToolBarButton; public: static KviCustomizeToolBarsDialog * instance(){ return m_pInstance; }; static void display(); static void cleanup(); protected: - virtual void showEvent(QShowEvent * e); - virtual void closeEvent(QCloseEvent *e); + virtual void showEvent(TQShowEvent * e); + virtual void closeEvent(TQCloseEvent *e); protected slots: void closeClicked(); void newToolBar(); @@ -62,54 +63,56 @@ protected slots: void currentToolBarChanged(); }; -class QLineEdit; -class QPushButton; +class TQLineEdit; +class TQPushButton; -class KviCustomToolBarPropertiesDialog : public QDialog +class KviCustomToolBarPropertiesDialog : public TQDialog { Q_OBJECT + TQ_OBJECT public: - KviCustomToolBarPropertiesDialog(QWidget * p,const QString &szText,const QString &szId = QString::null,const QString &szLabel = QString::null,const QString &szIconId = QString::null); + KviCustomToolBarPropertiesDialog(TQWidget * p,const TQString &szText,const TQString &szId = TQString(),const TQString &szLabel = TQString(),const TQString &szIconId = TQString()); ~KviCustomToolBarPropertiesDialog(); protected: - QString m_szId; - QString m_szOriginalId; - QString m_szLabel; - QString m_szIconId; - QWidget * m_pAdvanced; - QLineEdit * m_pIdEdit; - QLineEdit * m_pLabelEdit; - QLineEdit * m_pIconEdit; - QPushButton * m_pIconButton; - QPushButton * m_pAdvancedButton; + TQString m_szId; + TQString m_szOriginalId; + TQString m_szLabel; + TQString m_szIconId; + TQWidget * m_pAdvanced; + TQLineEdit * m_pIdEdit; + TQLineEdit * m_pLabelEdit; + TQLineEdit * m_pIconEdit; + TQPushButton * m_pIconButton; + TQPushButton * m_pAdvancedButton; public: - const QString &id(){ return m_szId; }; - const QString &label(){ return m_szLabel; }; - const QString &iconId(){ return m_szIconId; }; + const TQString &id(){ return m_szId; }; + const TQString &label(){ return m_szLabel; }; + const TQString &iconId(){ return m_szIconId; }; protected slots: void okClicked(); void advancedClicked(); void iconButtonClicked(); - void labelTextChanged(const QString &s); + void labelTextChanged(const TQString &s); protected: - void iconSelected(const QString &szIconId); + void iconSelected(const TQString &szIconId); }; -class QTimer; +class TQTimer; -class KviTrashcanLabel : public QLabel +class KviTrashcanLabel : public TQLabel { Q_OBJECT + TQ_OBJECT public: - KviTrashcanLabel(QWidget * p); + KviTrashcanLabel(TQWidget * p); virtual ~KviTrashcanLabel(); protected: unsigned int m_uFlashCount; - QTimer * m_pFlashTimer; - QColor m_clrOriginal; + TQTimer * m_pFlashTimer; + TQColor m_clrOriginal; protected: - virtual void dragEnterEvent(QDragEnterEvent * e); - virtual void dropEvent(QDropEvent * e); + virtual void dragEnterEvent(TQDragEnterEvent * e); + virtual void dropEvent(TQDropEvent * e); public slots: void flash(); protected slots: -- cgit v1.2.1