diff options
Diffstat (limited to 'kdialog')
-rw-r--r-- | kdialog/kdialog.cpp | 20 | ||||
-rw-r--r-- | kdialog/widgets.cpp | 20 |
2 files changed, 20 insertions, 20 deletions
diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp index 8b311e482..348314800 100644 --- a/kdialog/kdialog.cpp +++ b/kdialog/kdialog.cpp @@ -313,15 +313,15 @@ static int directCommand(TDECmdLineArgs *args) 0, // name duration ); TQTimer *timer = new TQTimer(); - TQObject::connect( timer, TQ_SIGNAL( timeout() ), kapp, TQ_SLOT( quit() ) ); - TQObject::connect( popup, TQ_SIGNAL( clicked() ), kapp, TQ_SLOT( quit() ) ); + TQObject::connect( timer, TQ_SIGNAL( timeout() ), tdeApp, TQ_SLOT( quit() ) ); + TQObject::connect( popup, TQ_SIGNAL( clicked() ), tdeApp, TQ_SLOT( quit() ) ); timer->start( duration, TRUE ); #ifdef TQ_WS_X11 - if ( ! kapp->geometryArgument().isEmpty()) { + if ( ! tdeApp->geometryArgument().isEmpty()) { int x, y; int w, h; - int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h); + int m = XParseGeometry( tdeApp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h); if ( (m & XNegative) ) x = TDEApplication::desktop()->width() + x - w; if ( (m & YNegative) ) @@ -329,7 +329,7 @@ static int directCommand(TDECmdLineArgs *args) popup->setAnchor( TQPoint(x, y) ); } #endif - kapp->exec(); + tdeApp->exec(); return 0; } @@ -469,7 +469,7 @@ static int directCommand(TDECmdLineArgs *args) dlg.setMode(KFile::File | KFile::LocalOnly); } Widgets::handleXGeometry(&dlg); - kapp->setTopWidget( &dlg ); + tdeApp->setTopWidget( &dlg ); dlg.setCaption(title.isNull() ? i18n("Open") : title); dlg.exec(); @@ -510,7 +510,7 @@ static int directCommand(TDECmdLineArgs *args) dlg.setSelection( startDir ); dlg.setOperationMode( KFileDialog::Saving ); Widgets::handleXGeometry(&dlg); - kapp->setTopWidget( &dlg ); + tdeApp->setTopWidget( &dlg ); dlg.setCaption(title.isNull() ? i18n("Save As") : title); dlg.exec(); @@ -545,7 +545,7 @@ static int directCommand(TDECmdLineArgs *args) KDirSelectDialog myDialog( startDir, true, 0, "kdirselect dialog", true ); - kapp->setTopWidget( &myDialog ); + tdeApp->setTopWidget( &myDialog ); Widgets::handleXGeometry(&myDialog); if ( !title.isNull() ) @@ -581,7 +581,7 @@ static int directCommand(TDECmdLineArgs *args) dlg.setMode(KFile::File); } Widgets::handleXGeometry(&dlg); - kapp->setTopWidget( &dlg ); + tdeApp->setTopWidget( &dlg ); dlg.setCaption(title.isNull() ? i18n("Open") : title); dlg.exec(); @@ -649,7 +649,7 @@ static int directCommand(TDECmdLineArgs *args) context = TDEIcon::StatusIcon; TDEIconDialog dlg(0, "icon dialog"); - kapp->setTopWidget( &dlg ); + tdeApp->setTopWidget( &dlg ); dlg.setup( group, context); if (!title.isNull()) dlg.setCaption(title); diff --git a/kdialog/widgets.cpp b/kdialog/widgets.cpp index 126eeec22..c0f3921f5 100644 --- a/kdialog/widgets.cpp +++ b/kdialog/widgets.cpp @@ -42,10 +42,10 @@ void Widgets::handleXGeometry(TQWidget * dlg) { #ifdef TQ_WS_X11 - if ( ! kapp->geometryArgument().isEmpty()) { + if ( ! tdeApp->geometryArgument().isEmpty()) { int x, y; int w, h; - int m = XParseGeometry( kapp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h); + int m = XParseGeometry( tdeApp->geometryArgument().latin1(), &x, &y, (unsigned int*)&w, (unsigned int*)&h); if ( (m & XNegative) ) x = TDEApplication::desktop()->width() + x - w; if ( (m & YNegative) ) @@ -69,7 +69,7 @@ bool Widgets::passwordBox(TQWidget *parent, const TQString& title, const TQStrin { KPasswordDialog dlg( KPasswordDialog::Password, false, 0, parent ); - kapp->setTopWidget( &dlg ); + tdeApp->setTopWidget( &dlg ); dlg.setCaption(title); dlg.setPrompt(text); @@ -86,7 +86,7 @@ int Widgets::textBox(TQWidget *parent, int width, int height, const TQString& ti // KTextBox dlg(parent, 0, TRUE, width, height, file); KDialogBase dlg( parent, 0, true, title, KDialogBase::Ok, KDialogBase::Ok ); - kapp->setTopWidget( &dlg ); + tdeApp->setTopWidget( &dlg ); KTextEdit *edit = new KTextEdit( dlg.makeVBoxMainWidget() ); edit->setReadOnly(TRUE); @@ -119,7 +119,7 @@ int Widgets::textInputBox(TQWidget *parent, int width, int height, const TQStrin // KTextBox dlg(parent, 0, TRUE, width, height, file); KDialogBase dlg( parent, 0, true, title, KDialogBase::Ok, KDialogBase::Ok ); - kapp->setTopWidget( &dlg ); + tdeApp->setTopWidget( &dlg ); TQVBox* vbox = dlg.makeVBoxMainWidget(); if( args.count() > 0 ) @@ -152,7 +152,7 @@ bool Widgets::comboBox(TQWidget *parent, const TQString& title, const TQString& KDialogBase dlg( parent, 0, true, title, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok ); - kapp->setTopWidget( &dlg ); + tdeApp->setTopWidget( &dlg ); dlg.setCaption(title); TQVBox* vbox = dlg.makeVBoxMainWidget(); @@ -177,7 +177,7 @@ bool Widgets::listBox(TQWidget *parent, const TQString& title, const TQString& t { TDEListBoxDialog box(text,parent); - kapp->setTopWidget( &box ); + tdeApp->setTopWidget( &box ); box.setCaption(title); for (unsigned int i = 0; i+1<args.count(); i += 2) { @@ -205,7 +205,7 @@ bool Widgets::checkList(TQWidget *parent, const TQString& title, const TQString& TQListBox &table = box.getTable(); - kapp->setTopWidget( &box ); + tdeApp->setTopWidget( &box ); box.setCaption(title); for (unsigned int i=0; i+2<args.count(); i += 3) { @@ -249,7 +249,7 @@ bool Widgets::radioBox(TQWidget *parent, const TQString& title, const TQString& TQListBox &table = box.getTable(); - kapp->setTopWidget( &box ); + tdeApp->setTopWidget( &box ); box.setCaption(title); for (unsigned int i=0; i+2<args.count(); i += 3) { @@ -274,7 +274,7 @@ bool Widgets::radioBox(TQWidget *parent, const TQString& title, const TQString& bool Widgets::progressBar(TQWidget *parent, const TQString& title, const TQString& text, int totalSteps) { ProgressDialog dlg( parent, title, text, totalSteps ); - kapp->setTopWidget( &dlg ); + tdeApp->setTopWidget( &dlg ); dlg.setCaption( title ); handleXGeometry(&dlg); dlg.exec(); |