diff options
Diffstat (limited to 'ark/mainwindow.cpp')
| -rw-r--r-- | ark/mainwindow.cpp | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp index 4726989..cada938 100644 --- a/ark/mainwindow.cpp +++ b/ark/mainwindow.cpp @@ -49,7 +49,7 @@ MainWindow::MainWindow( TQWidget * /*parent*/, const char *name ) : KParts::MainWindow(), progressDialog( 0 ) { setXMLFile( "arkui.rc" ); - m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>( "libarkpart", this, name, TQT_TQOBJECT(this), "ArkPart"); + m_part = KParts::ComponentFactory::createPartInstanceFromLibrary<KParts::ReadWritePart>( "libarkpart", this, name, this, "ArkPart"); if (m_part ) { //Since most of the functionality is still in ArkWidget: @@ -58,29 +58,29 @@ MainWindow::MainWindow( TQWidget * /*parent*/, const char *name ) setStandardToolBarMenuEnabled( true ); setupActions(); - connect( m_part->widget(), TQT_SIGNAL( request_file_quit() ), this, TQT_SLOT( file_quit() ) ); - connect( KParts::BrowserExtension::childObject( m_part ), TQT_SIGNAL( openURLRequestDelayed + connect( m_part->widget(), TQ_SIGNAL( request_file_quit() ), this, TQ_SLOT( file_quit() ) ); + connect( KParts::BrowserExtension::childObject( m_part ), TQ_SIGNAL( openURLRequestDelayed ( const KURL &, const KParts::URLArgs & ) ), - m_part, TQT_SLOT( openURL( const KURL & ) ) ); + m_part, TQ_SLOT( openURL( const KURL & ) ) ); m_widget->setArchivePopupEnabled( true ); - connect( m_part->widget(), TQT_SIGNAL( signalArchivePopup( const TQPoint & ) ), this, - TQT_SLOT( slotArchivePopup( const TQPoint & ) ) ); - - connect( m_part, TQT_SIGNAL( removeRecentURL( const KURL & ) ), this, - TQT_SLOT( slotRemoveRecentURL( const KURL & ) ) ); - connect( m_part, TQT_SIGNAL( addRecentURL( const KURL & ) ), this, - TQT_SLOT( slotAddRecentURL( const KURL & ) ) ); - connect( m_part, TQT_SIGNAL( fixActionState( const bool & ) ), this, - TQT_SLOT( slotFixActionState( const bool & ) ) ); - connect( m_widget, TQT_SIGNAL( disableAllActions() ), this, - TQT_SLOT( slotDisableActions() ) ); + connect( m_part->widget(), TQ_SIGNAL( signalArchivePopup( const TQPoint & ) ), this, + TQ_SLOT( slotArchivePopup( const TQPoint & ) ) ); + + connect( m_part, TQ_SIGNAL( removeRecentURL( const KURL & ) ), this, + TQ_SLOT( slotRemoveRecentURL( const KURL & ) ) ); + connect( m_part, TQ_SIGNAL( addRecentURL( const KURL & ) ), this, + TQ_SLOT( slotAddRecentURL( const KURL & ) ) ); + connect( m_part, TQ_SIGNAL( fixActionState( const bool & ) ), this, + TQ_SLOT( slotFixActionState( const bool & ) ) ); + connect( m_widget, TQ_SIGNAL( disableAllActions() ), this, + TQ_SLOT( slotDisableActions() ) ); ArkApplication::getInstance()->addWindow(); - connect( m_widget, TQT_SIGNAL( removeOpenArk( const KURL &) ), this, - TQT_SLOT( slotRemoveOpenArk( const KURL & ) ) ); - connect( m_widget, TQT_SIGNAL( addOpenArk( const KURL & ) ), this, - TQT_SLOT( slotAddOpenArk( const KURL & ) ) ); + connect( m_widget, TQ_SIGNAL( removeOpenArk( const KURL &) ), this, + TQ_SLOT( slotRemoveOpenArk( const KURL & ) ) ); + connect( m_widget, TQ_SIGNAL( addOpenArk( const KURL & ) ), this, + TQ_SLOT( slotAddOpenArk( const KURL & ) ) ); setCentralWidget( m_part->widget() ); createGUI( m_part ); @@ -109,24 +109,24 @@ MainWindow::~MainWindow() void MainWindow::setupActions() { - newWindowAction = new TDEAction(i18n("New &Window"), "window-new", TDEShortcut(), TQT_TQOBJECT(this), - TQT_SLOT(file_newWindow()), actionCollection(), "new_window"); + newWindowAction = new TDEAction(i18n("New &Window"), "window-new", TDEShortcut(), this, + TQ_SLOT(file_newWindow()), actionCollection(), "new_window"); - newArchAction = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(file_new()), actionCollection()); - openAction = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(file_open()), actionCollection()); + newArchAction = KStdAction::openNew(this, TQ_SLOT(file_new()), actionCollection()); + openAction = KStdAction::open(this, TQ_SLOT(file_open()), actionCollection()); - reloadAction = new TDEAction(i18n("Re&load"), "reload", TDEStdAccel::shortcut( TDEStdAccel::Reload ), TQT_TQOBJECT(this), - TQT_SLOT(file_reload()), actionCollection(), "reload_arch"); - closeAction = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(file_close()), actionCollection(), "file_close"); + reloadAction = new TDEAction(i18n("Re&load"), "reload", TDEStdAccel::shortcut( TDEStdAccel::Reload ), this, + TQ_SLOT(file_reload()), actionCollection(), "reload_arch"); + closeAction = KStdAction::close(this, TQ_SLOT(file_close()), actionCollection(), "file_close"); - recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openURL(const KURL&)), actionCollection()); + recent = KStdAction::openRecent(this, TQ_SLOT(openURL(const KURL&)), actionCollection()); recent->loadEntries(kapp->config()); createStandardStatusBarAction(); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(window_close()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(editToolbars()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT( slotConfigureKeyBindings()), actionCollection()); + KStdAction::quit(this, TQ_SLOT(window_close()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(editToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT( slotConfigureKeyBindings()), actionCollection()); openAction->setEnabled( true ); recent->setEnabled( true ); @@ -179,7 +179,7 @@ MainWindow::editToolbars() { saveMainWindowSettings( TDEGlobal::config(), TQString::fromLatin1("MainWindow") ); KEditToolbar dlg( factory(), this ); - connect(&dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() )); + connect(&dlg, TQ_SIGNAL( newToolbarConfig() ), this, TQ_SLOT( slotNewToolbarConfig() )); dlg.exec(); } @@ -462,10 +462,10 @@ MainWindow::startProgressDialog( const TQString & text ) progressDialog->setMinimumDuration( 500 ); progressDialog->show(); KDialog::centerOnScreen( progressDialog ); - connect( progressDialog, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( window_close() ) ); + connect( progressDialog, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( window_close() ) ); timer = new TQTimer( this ); - connect( timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotProgress() ) ); + connect( timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotProgress() ) ); timer->start( 200, false ); } |