diff options
Diffstat (limited to 'kompare/kompare_shell.cpp')
| -rw-r--r-- | kompare/kompare_shell.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp index 55027091..46dbfb9a 100644 --- a/kompare/kompare_shell.cpp +++ b/kompare/kompare_shell.cpp @@ -86,7 +86,7 @@ KompareShell::KompareShell() m_mainViewDock = createDockWidget( "View", kapp->icon() ); // now that the Part is loaded, we cast it to a KomparePart to get // our hands on it - m_viewPart = static_cast<KomparePart*>(mainViewFactory->create(TQT_TQOBJECT(m_mainViewDock), + m_viewPart = static_cast<KomparePart*>(mainViewFactory->create(m_mainViewDock, "kompare_part", "KParts::ReadWritePart" )); if ( m_viewPart ) @@ -122,7 +122,7 @@ KompareShell::KompareShell() { m_navTreeDock = createDockWidget( "Navigation", kapp->icon() ); - m_navTreePart = static_cast<KompareNavTreePart*>(navTreeFactory->create(TQT_TQOBJECT(m_navTreeDock), + m_navTreePart = static_cast<KompareNavTreePart*>(navTreeFactory->create(m_navTreeDock, "komparenavtreepart", "KParts::ReadOnlyPart" )); if ( m_navTreePart ) @@ -171,9 +171,9 @@ KompareShell::KompareShell() // Hook up the KomparePart -> KompareShell communication connect( m_viewPart, TQT_SIGNAL( setStatusBarModelInfo( int, int, int, int, int ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotUpdateStatusBar( int, int, int, int, int ) ) ); + this, TQT_SLOT( slotUpdateStatusBar( int, int, int, int, int ) ) ); connect( m_viewPart, TQT_SIGNAL( setStatusBarText(const TQString&) ), - TQT_TQOBJECT(this), TQT_SLOT( slotSetStatusBarText(const TQString&) ) ); + this, TQT_SLOT( slotSetStatusBarText(const TQString&) ) ); // Read basic main-view settings, and set to autosave setAutoSaveSettings( "General Options" ); @@ -229,26 +229,26 @@ void KompareShell::blend( const KURL& url1, const KURL& diff ) void KompareShell::setupActions() { - TDEAction* open = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); + TDEAction* open = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection()); open->setText( i18n( "&Open Diff..." ) ); new TDEAction( i18n("&Compare Files..."), "document-open", TQt::CTRL + TQt::Key_C, - TQT_TQOBJECT(this), TQT_SLOT(slotFileCompareFiles()), + this, TQT_SLOT(slotFileCompareFiles()), actionCollection(), "file_compare_files" ); new TDEAction( i18n("&Blend URL with Diff..."), "fileblend", TQt::CTRL + TQt::Key_B, - TQT_TQOBJECT(this), TQT_SLOT(slotFileBlendURLAndDiff()), + this, TQT_SLOT(slotFileBlendURLAndDiff()), actionCollection(), "file_blend_url" ); - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotFileClose() ), actionCollection() ); + KStdAction::quit( this, TQT_SLOT( slotFileClose() ), actionCollection() ); #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90) createStandardStatusBarAction(); #endif setStandardToolBarMenuEnabled(true); - m_showTextView = new TDEToggleAction( i18n("Show T&ext View"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowTextView()), + m_showTextView = new TDEToggleAction( i18n("Show T&ext View"), 0, this, TQT_SLOT(slotShowTextView()), actionCollection(), "options_show_text_view" ); m_showTextView->setCheckedState(i18n("Hide T&ext View")); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); } void KompareShell::setupStatusBar() @@ -439,14 +439,14 @@ void KompareShell::slotShowTextView() m_textViewWidget = createDockWidget( i18n("Text View"), SmallIcon( "text") ); m_textViewPart = KParts::ComponentFactory::createPartInstanceFromQuery<KTextEditor::Document>( TQString::fromLatin1("KTextEditor/Document"), - TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0, TQStringList(), &errCode ); + TQString(), this, 0, this, 0, TQStringList(), &errCode ); if ( m_textViewPart ) { m_textView = m_textViewPart->createView( this, 0 ); - m_textViewWidget->setWidget( static_cast<TQWidget*>(m_textView) ); + m_textViewWidget->setWidget( m_textView ); m_textEditIface = editInterface( m_textViewPart ); connect( m_viewPart, TQT_SIGNAL(diffString(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(slotSetDiffString(const TQString&)) ); + this, TQT_SLOT(slotSetDiffString(const TQString&)) ); } } |