diff options
Diffstat (limited to 'tdeui/kdialog.cpp')
| -rw-r--r-- | tdeui/kdialog.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tdeui/kdialog.cpp b/tdeui/kdialog.cpp index 72925525c..826012ab1 100644 --- a/tdeui/kdialog.cpp +++ b/tdeui/kdialog.cpp @@ -41,7 +41,7 @@ #include <tqpushbutton.h> #include "config.h" -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 #include <netwm.h> #endif @@ -121,7 +121,7 @@ void KDialog::polish() void KDialog::setCaption( const TQString &_caption ) { - TQString caption = kapp ? kapp->makeStdCaption( _caption ) : _caption; + TQString caption = tdeApp ? tdeApp->makeStdCaption( _caption ) : _caption; setPlainCaption( caption ); } @@ -130,7 +130,7 @@ void KDialog::setPlainCaption( const TQString &caption ) { TQDialog::setCaption( caption ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 NETWinInfo info( tqt_xdisplay(), winId(), tqt_xrootwin(), 0 ); info.setName( caption.utf8().data() ); #endif @@ -141,7 +141,7 @@ void KDialog::resizeLayout( TQWidget *w, int margin, int spacing ) { if( w->layout() ) { - resizeLayout( TQT_TQLAYOUTITEM(w->layout()), margin, spacing ); + resizeLayout( w->layout(), margin, spacing ); } if( !w->childrenListObject().isEmpty() ) @@ -295,7 +295,7 @@ void KDialogQueue::queueDialog(TQDialog *dialog) { KDialogQueue *_this = self(); _this->d->queue.append(dialog); - TQTimer::singleShot(0, _this, TQT_SLOT(slotShowQueuedDialog())); + TQTimer::singleShot(0, _this, TQ_SLOT(slotShowQueuedDialog())); } void KDialogQueue::slotShowQueuedDialog() @@ -317,7 +317,7 @@ void KDialogQueue::slotShowQueuedDialog() delete dialog; if (!d->queue.isEmpty()) - TQTimer::singleShot(20, this, TQT_SLOT(slotShowQueuedDialog())); + TQTimer::singleShot(20, this, TQ_SLOT(slotShowQueuedDialog())); else ksdkdq.destructObject(); // Suicide. } @@ -326,7 +326,7 @@ void KDialog::virtual_hook( int, void* ) { /*BASE::virtual_hook( id, data );*/ } KSMModalDialogHeader::KSMModalDialogHeader(TQWidget* parent) - : TQWidget( parent, "", Qt::WDestructiveClose ) + : TQWidget( parent, "", TQt::WDestructiveClose ) { TQVBoxLayout* vbox = new TQVBoxLayout( this ); @@ -375,7 +375,7 @@ KSMModalDialogHeader::KSMModalDialogHeader(TQWidget* parent) TQWidget* swidget = new TQWidget( frame ); swidget->resize(2, frame->sizeHint().width()); - swidget->setBackgroundColor(Qt::black); + swidget->setBackgroundColor(TQt::black); seperatorbox->addWidget( swidget, AlignCenter ); TQLabel* label = new TQLabel( i18n("Trinity Desktop Environment"), frame ); @@ -396,7 +396,7 @@ KSMModalDialogHeader::~KSMModalDialogHeader() } KSMModalDialog::KSMModalDialog(TQWidget* parent) - : TQWidget( 0, "systemmodaldialogclass", Qt::WStyle_Customize | Qt::WType_Dialog | Qt::WStyle_Title | Qt::WStyle_StaysOnTop | Qt::WDestructiveClose ), m_keepOnTopTimer(NULL), m_allowClose(false) + : TQWidget( 0, "systemmodaldialogclass", TQt::WStyle_Customize | TQt::WType_Dialog | TQt::WStyle_Title | TQt::WStyle_StaysOnTop | TQt::WDestructiveClose ), m_keepOnTopTimer(NULL), m_allowClose(false) { // Signal that we do not want any window controls to be shown at all @@ -461,8 +461,8 @@ void KSMModalDialog::keepMeOnTop() { if (!m_keepOnTopTimer) { m_keepOnTopTimer = new TQTimer(); - connect(m_keepOnTopTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(keepMeOnTop())); - m_keepOnTopTimer->start(100, FALSE); + connect(m_keepOnTopTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(keepMeOnTop())); + m_keepOnTopTimer->start(100, false); } setActiveWindow(); raise(); |