diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-04 10:30:32 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-01-04 12:36:03 +0900 |
commit | c0332621bc998c9786f4841e86a62b7711fe4abf (patch) | |
tree | 38b3ab6688de7a9396a1c5993a8ec265f5f33b64 /koshell | |
parent | 6c81ff8d61ec679e735d3fbd875583b12f0ef0a5 (diff) | |
download | koffice-c0332621bc998c9786f4841e86a62b7711fe4abf.tar.gz koffice-c0332621bc998c9786f4841e86a62b7711fe4abf.zip |
Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'koshell')
-rw-r--r-- | koshell/iconsidepane.cpp | 18 | ||||
-rw-r--r-- | koshell/koshell_shell.cpp | 40 |
2 files changed, 29 insertions, 29 deletions
diff --git a/koshell/iconsidepane.cpp b/koshell/iconsidepane.cpp index c92fa97a..392aacf7 100644 --- a/koshell/iconsidepane.cpp +++ b/koshell/iconsidepane.cpp @@ -218,11 +218,11 @@ Navigator::Navigator(bool _selectable, TDEPopupMenu * menu, IconSidePane *_icons setFocusPolicy( TQWidget::NoFocus ); - connect( this, TQT_SIGNAL( clicked( TQListBoxItem* ) ), - TQT_SLOT( slotExecuted( TQListBoxItem* ) ) ); - connect( this, TQT_SIGNAL( onItem( TQListBoxItem * ) ), - TQT_SLOT( slotMouseOn( TQListBoxItem * ) ) ); - connect( this, TQT_SIGNAL( onViewport() ), TQT_SLOT( slotMouseOff() ) ); + connect( this, TQ_SIGNAL( clicked( TQListBoxItem* ) ), + TQ_SLOT( slotExecuted( TQListBoxItem* ) ) ); + connect( this, TQ_SIGNAL( onItem( TQListBoxItem * ) ), + TQ_SLOT( slotMouseOn( TQListBoxItem * ) ) ); + connect( this, TQ_SIGNAL( onViewport() ), TQ_SLOT( slotMouseOff() ) ); TQToolTip::remove( this ); if ( !mSidePane->showText() ) @@ -485,15 +485,15 @@ void IconSidePane::removeItem( int _grp, int _id ) int IconSidePane::insertGroup(const TQString &_text, bool _selectable, TQObject *_obj, const char *_slot) { mCurrentNavigator = new Navigator(_selectable, mPopupMenu, this, mWidgetstack ); - //connect( mCurrentNavigator, TQT_SIGNAL( itemSelected( int ) ), this, TQT_SLOT( itemSelected( int ) ) ); + //connect( mCurrentNavigator, TQ_SIGNAL( itemSelected( int ) ), this, TQ_SLOT( itemSelected( int ) ) ); if ( _obj != 0L && _slot != 0L ) - connect( mCurrentNavigator, TQT_SIGNAL( itemSelected(int ) ), _obj, _slot ); - connect( mCurrentNavigator, TQT_SIGNAL( updateAllWidgets() ), this, TQT_SLOT(updateAllWidgets()) ); + connect( mCurrentNavigator, TQ_SIGNAL( itemSelected(int ) ), _obj, _slot ); + connect( mCurrentNavigator, TQ_SIGNAL( updateAllWidgets() ), this, TQ_SLOT(updateAllWidgets()) ); int const id = mWidgetstack->addWidget(mCurrentNavigator); mWidgetStackIds.append( id ); KPushButton *b = new KPushButton( _text, m_buttongroup ); m_buttongroup->insert( b, id ); - connect( b, TQT_SIGNAL( clicked() ), this, TQT_SLOT( buttonClicked() ) ); + connect( b, TQ_SIGNAL( clicked() ), this, TQ_SLOT( buttonClicked() ) ); b->setToggleButton( true ); b->setFocusPolicy( TQWidget::NoFocus ); if (m_buttongroup->count()==1) diff --git a/koshell/koshell_shell.cpp b/koshell/koshell_shell.cpp index b3cbef71..e7fb17fe 100644 --- a/koshell/koshell_shell.cpp +++ b/koshell/koshell_shell.cpp @@ -69,8 +69,8 @@ KoShellWindow::KoShellWindow() m_pSidebar->setSizePolicy( TQSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Preferred ) ); m_pSidebar->setActionCollection( actionCollection() ); - m_grpFile = m_pSidebar->insertGroup(i18n("Components"), false, this, TQT_SLOT( slotSidebar_Part(int ))); - m_grpDocuments = m_pSidebar->insertGroup(i18n("Documents"), true, this, TQT_SLOT(slotSidebar_Document(int))); + m_grpFile = m_pSidebar->insertGroup(i18n("Components"), false, this, TQ_SLOT( slotSidebar_Part(int ))); + m_grpDocuments = m_pSidebar->insertGroup(i18n("Documents"), true, this, TQ_SLOT(slotSidebar_Document(int))); m_pLayout->setResizeMode(m_pSidebar,TQSplitter::FollowSizeHint); // Setup the tabbar @@ -80,8 +80,8 @@ KoShellWindow::KoShellWindow() m_pFrame->setTabPosition( KTabWidget::Bottom ); m_tabCloseButton = new TQToolButton( m_pFrame ); - connect( m_tabCloseButton, TQT_SIGNAL( clicked() ), - this, TQT_SLOT( slotFileClose() ) ); + connect( m_tabCloseButton, TQ_SIGNAL( clicked() ), + this, TQ_SLOT( slotFileClose() ) ); m_tabCloseButton->setIconSet( SmallIconSet( "tab_remove" ) ); m_tabCloseButton->adjustSize(); TQToolTip::add(m_tabCloseButton, i18n("Close")); @@ -112,12 +112,12 @@ KoShellWindow::KoShellWindow() list.append( this->width() - KoShellSettings::sidebarWidth() ); m_pLayout->setSizes( list ); - connect( this, TQT_SIGNAL( documentSaved() ), - this, TQT_SLOT( slotNewDocumentName() ) ); + connect( this, TQ_SIGNAL( documentSaved() ), + this, TQ_SLOT( slotNewDocumentName() ) ); - connect( m_pFrame, TQT_SIGNAL( currentChanged( TQWidget* ) ), - this, TQT_SLOT( slotUpdatePart( TQWidget* ) ) ); - connect( m_pFrame, TQT_SIGNAL( contextMenu(TQWidget * ,const TQPoint &)), this, TQT_SLOT( tab_contextMenu(TQWidget * ,const TQPoint &)) ); + connect( m_pFrame, TQ_SIGNAL( currentChanged( TQWidget* ) ), + this, TQ_SLOT( slotUpdatePart( TQWidget* ) ) ); + connect( m_pFrame, TQ_SIGNAL( contextMenu(TQWidget * ,const TQPoint &)), this, TQ_SLOT( tab_contextMenu(TQWidget * ,const TQPoint &)) ); m_client = new KoShellGUIClient( this ); createShellGUI(); @@ -208,9 +208,9 @@ bool KoShellWindow::openDocumentInternal( const KURL &url, KoDocument* ) return false; } - connect(newdoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - connect(newdoc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotKSLoadCompleted())); - connect(newdoc, TQT_SIGNAL(canceled( const TQString & )), this, TQT_SLOT(slotKSLoadCanceled( const TQString & ))); + connect(newdoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + connect(newdoc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotKSLoadCompleted())); + connect(newdoc, TQ_SIGNAL(canceled( const TQString & )), this, TQ_SLOT(slotKSLoadCanceled( const TQString & ))); newdoc->addShell( this ); // used by openURL bool openRet = (!isImporting ()) ? newdoc->openURL(tmpUrl) : newdoc->import(tmpUrl); if ( !openRet ) @@ -292,9 +292,9 @@ void KoShellWindow::slotKSLoadCompleted() partManager()->addPart( newdoc, false ); setRootDocument( newdoc ); - disconnect(newdoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - disconnect(newdoc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotKSLoadCompleted())); - disconnect(newdoc, TQT_SIGNAL(canceled( const TQString & )), this, TQT_SLOT(slotKSLoadCanceled( const TQString & ))); + disconnect(newdoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + disconnect(newdoc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotKSLoadCompleted())); + disconnect(newdoc, TQ_SIGNAL(canceled( const TQString & )), this, TQ_SLOT(slotKSLoadCanceled( const TQString & ))); } void KoShellWindow::slotKSLoadCanceled( const TQString & errMsg ) @@ -304,9 +304,9 @@ void KoShellWindow::slotKSLoadCanceled( const TQString & errMsg ) // ###### FIXME: This can be done in 3.0 with deleteLater, I assume (Werner) KoDocument* newdoc = (KoDocument *)(sender()); - disconnect(newdoc, TQT_SIGNAL(sigProgress(int)), this, TQT_SLOT(slotProgress(int))); - disconnect(newdoc, TQT_SIGNAL(completed()), this, TQT_SLOT(slotKSLoadCompleted())); - disconnect(newdoc, TQT_SIGNAL(canceled( const TQString & )), this, TQT_SLOT(slotKSLoadCanceled( const TQString & ))); + disconnect(newdoc, TQ_SIGNAL(sigProgress(int)), this, TQ_SLOT(slotProgress(int))); + disconnect(newdoc, TQ_SIGNAL(completed()), this, TQ_SLOT(slotKSLoadCompleted())); + disconnect(newdoc, TQ_SIGNAL(canceled( const TQString & )), this, TQ_SLOT(slotKSLoadCanceled( const TQString & ))); } void KoShellWindow::saveAll() @@ -729,9 +729,9 @@ void KoShellWindow::showPartSpecificHelp() KoShellGUIClient::KoShellGUIClient( KoShellWindow *window ) : KXMLGUIClient() { setXMLFile( "koshellui.rc", true, true ); - window->mnuSaveAll = new TDEAction( i18n("Save All"), 0, window, TQT_SLOT( saveAll() ), actionCollection(), "save_all" ); + window->mnuSaveAll = new TDEAction( i18n("Save All"), 0, window, TQ_SLOT( saveAll() ), actionCollection(), "save_all" ); window->mnuSaveAll->setEnabled(false); - window->partSpecificHelpAction = new TDEAction(i18n("Part Handbook"), "contents", 0, window, TQT_SLOT(showPartSpecificHelp()), + window->partSpecificHelpAction = new TDEAction(i18n("Part Handbook"), "contents", 0, window, TQ_SLOT(showPartSpecificHelp()), actionCollection(), "partSpecificHelp"); window->partSpecificHelpAction->setEnabled(false); } |