From 43379ee382fcc18c575c57fdae218a7d0e51e526 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 5 Jan 2024 10:33:37 +0900 Subject: Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines Signed-off-by: Michele Calgaro --- src/kbfxbutton.cpp | 12 +++++------ src/kbfxplasmacanvasgroupview.cpp | 8 ++++---- src/kbfxplasmacanvasitem.cpp | 2 +- src/kbfxplasmacanvasview.cpp | 8 ++++---- src/kbfxplasmaindexview.cpp | 10 +++++----- src/kbfxspinx.cpp | 16 +++++++-------- src/kbfxspinxmenu.cpp | 42 +++++++++++++++++++-------------------- src/kbfxspinxscrollbar.cpp | 2 +- src/kbfxspinxtoolbutton.cpp | 2 +- src/kbfxtooltip.cpp | 6 +++--- 10 files changed, 54 insertions(+), 54 deletions(-) (limited to 'src') diff --git a/src/kbfxbutton.cpp b/src/kbfxbutton.cpp index 585b36e..9ae3410 100644 --- a/src/kbfxbutton.cpp +++ b/src/kbfxbutton.cpp @@ -44,11 +44,11 @@ KbfxButton::KbfxButton ( TQWidget * parent, const char *name) : m_toggle = false; TQTimer * timer = new TQTimer ( this,"Update Timer" ); - connect ( timer,TQT_SIGNAL ( timeout() ),this,TQT_SLOT ( update() ) ); + connect ( timer,TQ_SIGNAL ( timeout() ),this,TQ_SLOT ( update() ) ); timer->start ( 25,false ); fade_timer = new TQTimer ( this,"Fade Timer" ); - connect ( fade_timer,TQT_SIGNAL ( timeout() ),this,TQT_SLOT ( fade() ) ); + connect ( fade_timer,TQ_SIGNAL ( timeout() ),this,TQ_SLOT ( fade() ) ); } KbfxButton::~KbfxButton() @@ -273,14 +273,14 @@ void KbfxButton::mousePressEvent ( TQMouseEvent * e ) TQPopupMenu *popup = new TQPopupMenu(); popup->insertItem ( SmallIcon ( "remove" ), i18n ( "Remove KBFX from Pannel" ), - this, TQT_SLOT ( selfDeleter() ) ); + this, TQ_SLOT ( selfDeleter() ) ); popup->insertItem ( SmallIcon ( "reload" ),i18n ( "Reload KBFX" ), - this, TQT_SLOT ( reloadConfig() ) ); + this, TQ_SLOT ( reloadConfig() ) ); popup->insertSeparator(); popup->insertItem ( SmallIcon ( "kbfxconfigapp" ), i18n ( "Configure KBFX" ), - this, TQT_SLOT ( openConfigDialog() ) ); + this, TQ_SLOT ( openConfigDialog() ) ); popup->insertItem ( SmallIcon ( "kmenuedit" ),i18n ( "Edit Applications Menu" ), - this, TQT_SLOT ( openKmenuEdit() ) ); + this, TQ_SLOT ( openKmenuEdit() ) ); popup->exec ( e->globalPos() ); delete popup; } diff --git a/src/kbfxplasmacanvasgroupview.cpp b/src/kbfxplasmacanvasgroupview.cpp index 63a7347..5a3604b 100644 --- a/src/kbfxplasmacanvasgroupview.cpp +++ b/src/kbfxplasmacanvasgroupview.cpp @@ -62,10 +62,10 @@ KbfxPlasmaCanvasGroupView::addGroup ( KbfxPlasmaCanvasGroup * gPtr ) // gPtr->show(); // tqDebug("adding Groupy"); m_count++; - connect ( gPtr, TQT_SIGNAL ( groupShade ( uint ) ), this, - TQT_SLOT ( foldGroup ( uint ) ) ); - connect ( gPtr, TQT_SIGNAL ( groupUnShade ( uint ) ), this, - TQT_SLOT ( unFoldGroup ( uint ) ) ); + connect ( gPtr, TQ_SIGNAL ( groupShade ( uint ) ), this, + TQ_SLOT ( foldGroup ( uint ) ) ); + connect ( gPtr, TQ_SIGNAL ( groupUnShade ( uint ) ), this, + TQ_SLOT ( unFoldGroup ( uint ) ) ); } diff --git a/src/kbfxplasmacanvasitem.cpp b/src/kbfxplasmacanvasitem.cpp index c78a940..0c18256 100644 --- a/src/kbfxplasmacanvasitem.cpp +++ b/src/kbfxplasmacanvasitem.cpp @@ -32,7 +32,7 @@ KbfxPlasmaCanvasItem::KbfxPlasmaCanvasItem ( TQCanvasPixmapArray * a , TQCanvas m_commentText ="No Comment Set By Plugin"; m_height =_img->height(); m_width =_img->width(); - connect ( this,TQT_SIGNAL ( clicked() ),this,TQT_SLOT ( exec() ) ); + connect ( this,TQ_SIGNAL ( clicked() ),this,TQ_SLOT ( exec() ) ); m_type = OTHER; // ConfigInit().read(); m_noComments = ConfigInit().m_noComments; diff --git a/src/kbfxplasmacanvasview.cpp b/src/kbfxplasmacanvasview.cpp index 5fec81e..6814372 100644 --- a/src/kbfxplasmacanvasview.cpp +++ b/src/kbfxplasmacanvasview.cpp @@ -46,10 +46,10 @@ KbfxPlasmaCanvasView::KbfxPlasmaCanvasView ( TQWidget * parent, m_scrollbar_top->setType ( KbfxSpinxScrollBar::UP ); m_scrollbar_bot->setType ( KbfxSpinxScrollBar::DOWN ); - connect ( m_scrollbar_top, TQT_SIGNAL ( scroll ( int, int ) ), this, - TQT_SLOT ( scrollBy ( int, int ) ) ); - connect ( m_scrollbar_bot, TQT_SIGNAL ( scroll ( int, int ) ), this, - TQT_SLOT ( scrollBy ( int, int ) ) ); + connect ( m_scrollbar_top, TQ_SIGNAL ( scroll ( int, int ) ), this, + TQ_SLOT ( scrollBy ( int, int ) ) ); + connect ( m_scrollbar_bot, TQ_SIGNAL ( scroll ( int, int ) ), this, + TQ_SLOT ( scrollBy ( int, int ) ) ); placeScrollBars (); } diff --git a/src/kbfxplasmaindexview.cpp b/src/kbfxplasmaindexview.cpp index a1e575d..cba3b69 100644 --- a/src/kbfxplasmaindexview.cpp +++ b/src/kbfxplasmaindexview.cpp @@ -43,8 +43,8 @@ KbfxPlasmaIndexView::KbfxPlasmaIndexView ( TQWidget * parent, const char *name, m_currentItem = 0L; m_selectedItem = 0L; // m_pluginList = ""; - connect ( this, TQT_SIGNAL ( clicked ( KbfxPlasmaIndexItem * ) ), this, - TQT_SLOT ( slotClicked ( KbfxPlasmaIndexItem * ) ) ); + connect ( this, TQ_SIGNAL ( clicked ( KbfxPlasmaIndexItem * ) ), this, + TQ_SLOT ( slotClicked ( KbfxPlasmaIndexItem * ) ) ); m_currentView = 0; setDragAutoScroll ( true ); } @@ -167,8 +167,8 @@ KbfxPlasmaIndexView::contentsContextMenuEvent ( TQContextMenuEvent * event ) event = event; /* m_pluginMenu = new TDEPopupMenu ( this );; - connect ( m_pluginMenu, TQT_SIGNAL ( activated ( int ) ), this, - TQT_SLOT ( contextMenuSlot ( int ) ) ); + connect ( m_pluginMenu, TQ_SIGNAL ( activated ( int ) ), this, + TQ_SLOT ( contextMenuSlot ( int ) ) ); m_pluginMenu->insertTitle ( "Insert Plugin", 0, 0 ); int _index = 1; @@ -317,7 +317,7 @@ KbfxPlasmaIndexView::contentsMouseMoveEvent ( TQMouseEvent * me ) this->setCursor ( TQCursor ( TQt::PointingHandCursor ) ); - TQTimer::singleShot ( 800, this, TQT_SLOT ( checkMousePos () ) ); + TQTimer::singleShot ( 800, this, TQ_SLOT ( checkMousePos () ) ); if ( contentsToViewport ( me->pos () ).y () < this->height () / 5 ) { diff --git a/src/kbfxspinx.cpp b/src/kbfxspinx.cpp index 0c6001b..7c02679 100644 --- a/src/kbfxspinx.cpp +++ b/src/kbfxspinx.cpp @@ -60,14 +60,14 @@ void KbfxSpinx::createKbfx() else { createRMenu(); - connect ( m_menu,TQT_SIGNAL ( aboutToHide () ),kbfxBtn,TQT_SLOT ( toggle() ) ); + connect ( m_menu,TQ_SIGNAL ( aboutToHide () ),kbfxBtn,TQ_SLOT ( toggle() ) ); } kmenu_timer = new TQTimer ( this,"Fade Timer" ); - connect ( kmenu_timer, TQT_SIGNAL ( timeout() ), kbfxBtn, TQT_SLOT ( toggleKMenu () ) ); + connect ( kmenu_timer, TQ_SIGNAL ( timeout() ), kbfxBtn, TQ_SLOT ( toggleKMenu () ) ); - connect ( kbfxBtn , TQT_SIGNAL ( pressed() ),this,TQT_SLOT ( showKbfxMenu() ) ); - connect ( kbfxBtn , TQT_SIGNAL ( showToolTip() ),this,TQT_SLOT ( ToolTip() ) ); + connect ( kbfxBtn , TQ_SIGNAL ( pressed() ),this,TQ_SLOT ( showKbfxMenu() ) ); + connect ( kbfxBtn , TQ_SIGNAL ( showToolTip() ),this,TQ_SLOT ( ToolTip() ) ); if ( m_kicker_auto_adjust ) m_parent->resize ( m_parent->width(),kbfxBtn->height() ); @@ -82,8 +82,8 @@ void KbfxSpinx::createKbfx() l_path.append("/"); l_watch->addDir(l_path); l_watch->startScan( TRUE, FALSE); - connect ( l_watch, TQT_SIGNAL ( dirty(const TQString&) ), - this, TQT_SLOT ( dirtyReaload(const TQString&) ) ); + connect ( l_watch, TQ_SIGNAL ( dirty(const TQString&) ), + this, TQ_SLOT ( dirtyReaload(const TQString&) ) ); delete l_user; } } @@ -172,8 +172,8 @@ void KbfxSpinx::ToolTip () popx -= tooltip->width(); } - connect ( kbfxBtn, TQT_SIGNAL ( leave () ), tooltip, TQT_SLOT ( hideToolTip () ) ); - connect ( kbfxBtn, TQT_SIGNAL ( clicked () ), tooltip, TQT_SLOT ( hideToolTip () ) ); + connect ( kbfxBtn, TQ_SIGNAL ( leave () ), tooltip, TQ_SLOT ( hideToolTip () ) ); + connect ( kbfxBtn, TQ_SIGNAL ( clicked () ), tooltip, TQ_SLOT ( hideToolTip () ) ); tooltip->setStartPos ( popx, popy ); tooltip->show (); } diff --git a/src/kbfxspinxmenu.cpp b/src/kbfxspinxmenu.cpp index f881de4..c2a7f8c 100644 --- a/src/kbfxspinxmenu.cpp +++ b/src/kbfxspinxmenu.cpp @@ -86,8 +86,8 @@ KbfxSpinxMenuWidget::init() m_search->resize ( ConfigInit ().m_searchBox_w - m_searchTag->width (), ConfigInit ().m_searchBox_h ); - connect (m_searchTag, TQT_SIGNAL (mouseDoubleClicked ( const ButtonState & )), this, - TQT_SLOT (search_clear ( const ButtonState & ))); + connect (m_searchTag, TQ_SIGNAL (mouseDoubleClicked ( const ButtonState & )), this, + TQ_SLOT (search_clear ( const ButtonState & ))); int frameHeight = ConfigInit().m_listBox_h; @@ -143,37 +143,37 @@ KbfxSpinxMenuWidget::init() loadHistory (); - connect ( m_indexView, TQT_SIGNAL ( loadRequest ( KbfxSignal ) ), m_canvasView, - TQT_SLOT ( handleLoadRequest ( KbfxSignal ) ) ); + connect ( m_indexView, TQ_SIGNAL ( loadRequest ( KbfxSignal ) ), m_canvasView, + TQ_SLOT ( handleLoadRequest ( KbfxSignal ) ) ); - connect ( m_indexLeftView, TQT_SIGNAL ( loadRequest ( KbfxSignal ) ), m_canvasView, - TQT_SLOT ( handleLoadRequest ( KbfxSignal ) ) ); + connect ( m_indexLeftView, TQ_SIGNAL ( loadRequest ( KbfxSignal ) ), m_canvasView, + TQ_SLOT ( handleLoadRequest ( KbfxSignal ) ) ); - connect ( m_canvasView, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( hideMenu () ) ); + connect ( m_canvasView, TQ_SIGNAL ( clicked () ), this, TQ_SLOT ( hideMenu () ) ); - connect ( m_search, TQT_SIGNAL ( textChanged ( const TQString & ) ), m_canvasView, - TQT_SLOT ( search ( const TQString & ) ) ); + connect ( m_search, TQ_SIGNAL ( textChanged ( const TQString & ) ), m_canvasView, + TQ_SLOT ( search ( const TQString & ) ) ); connect ( m_indexView, - TQT_SIGNAL ( pluginRequest ( TQString, KbfxPlasmaCanvasView * ) ), - m_indexView, TQT_SLOT ( loadPlugin ( TQString, KbfxPlasmaCanvasView * ) ) ); + TQ_SIGNAL ( pluginRequest ( TQString, KbfxPlasmaCanvasView * ) ), + m_indexView, TQ_SLOT ( loadPlugin ( TQString, KbfxPlasmaCanvasView * ) ) ); connect ( m_indexLeftView, - TQT_SIGNAL ( pluginRequest ( TQString, KbfxPlasmaCanvasView * ) ), + TQ_SIGNAL ( pluginRequest ( TQString, KbfxPlasmaCanvasView * ) ), m_indexLeftView, - TQT_SLOT ( loadPlugin ( TQString, KbfxPlasmaCanvasView * ) ) ); + TQ_SLOT ( loadPlugin ( TQString, KbfxPlasmaCanvasView * ) ) ); connect ( m_indexView, - TQT_SIGNAL ( clearSelected() ), - m_indexLeftView, TQT_SLOT ( clearSelection() ) ); + TQ_SIGNAL ( clearSelected() ), + m_indexLeftView, TQ_SLOT ( clearSelection() ) ); connect ( m_indexLeftView, - TQT_SIGNAL ( clearSelected() ), + TQ_SIGNAL ( clearSelected() ), m_indexView, - TQT_SLOT ( clearSelection() ) ); + TQ_SLOT ( clearSelection() ) ); - connect (this,TQT_SIGNAL(refresh()),m_canvasView,TQT_SLOT(reload())); - connect (this,TQT_SIGNAL(runItem()),m_canvasView,TQT_SLOT(execFirst())); + connect (this,TQ_SIGNAL(refresh()),m_canvasView,TQ_SLOT(reload())); + connect (this,TQ_SIGNAL(runItem()),m_canvasView,TQ_SLOT(execFirst())); KbfxSpinxToolButton *logout = new KbfxSpinxToolButton ( m_toolBarBot ); KbfxSpinxToolButton *lock = new KbfxSpinxToolButton ( m_toolBarBot ); @@ -200,8 +200,8 @@ KbfxSpinxMenuWidget::init() m_toolBarBot->addButton ( logout ); m_toolBarBot->addButton ( lock ); - connect ( logout,TQT_SIGNAL ( clicked() ),this , TQT_SLOT ( hideMenu() ) ); - connect ( lock ,TQT_SIGNAL ( clicked() ),this , TQT_SLOT ( hideMenu() ) ); + connect ( logout,TQ_SIGNAL ( clicked() ),this , TQ_SLOT ( hideMenu() ) ); + connect ( lock ,TQ_SIGNAL ( clicked() ),this , TQ_SLOT ( hideMenu() ) ); } diff --git a/src/kbfxspinxscrollbar.cpp b/src/kbfxspinxscrollbar.cpp index f4cd784..eb6a174 100644 --- a/src/kbfxspinxscrollbar.cpp +++ b/src/kbfxspinxscrollbar.cpp @@ -44,7 +44,7 @@ KbfxSpinxScrollBar::KbfxSpinxScrollBar ( TQWidget * parent, const char *name, in m_triAngle = TQPointArray ( 3 ); m_dir = DOWN; m_timer = new TQTimer ( this,"ScrollTimer" ); - connect ( m_timer,TQT_SIGNAL ( timeout() ),this,TQT_SLOT ( timeoutslot() ) ); + connect ( m_timer,TQ_SIGNAL ( timeout() ),this,TQ_SLOT ( timeoutslot() ) ); m_pressed = false; } diff --git a/src/kbfxspinxtoolbutton.cpp b/src/kbfxspinxtoolbutton.cpp index c82e147..afe3c52 100644 --- a/src/kbfxspinxtoolbutton.cpp +++ b/src/kbfxspinxtoolbutton.cpp @@ -28,7 +28,7 @@ KbfxSpinxToolButton::KbfxSpinxToolButton ( TQWidget * parent , const char * name m_fadeTime = ConfigInit().m_fadeTime; fade_timer = new TQTimer ( this,"Fade Timer" ); - connect ( fade_timer,TQT_SIGNAL ( timeout() ),this,TQT_SLOT ( fade() ) ); + connect ( fade_timer,TQ_SIGNAL ( timeout() ),this,TQ_SLOT ( fade() ) ); } diff --git a/src/kbfxtooltip.cpp b/src/kbfxtooltip.cpp index b929380..7c0b1aa 100644 --- a/src/kbfxtooltip.cpp +++ b/src/kbfxtooltip.cpp @@ -61,9 +61,9 @@ KbfxToolTip::KbfxToolTip ( TQWidget * parent, const char *name, WFlags fl ) : _update_timer = new TQTimer ( this ); _move_timer = new TQTimer ( this ); - connect ( _hide_timer, TQT_SIGNAL ( timeout () ), this, TQT_SLOT ( hide () ) ); - connect ( _hide_timer, TQT_SIGNAL ( timeout () ), _agent, TQT_SLOT ( hide () ) ); - connect ( _update_timer, TQT_SIGNAL ( timeout () ), this, TQT_SLOT ( logoMove () ) ); + connect ( _hide_timer, TQ_SIGNAL ( timeout () ), this, TQ_SLOT ( hide () ) ); + connect ( _hide_timer, TQ_SIGNAL ( timeout () ), _agent, TQ_SLOT ( hide () ) ); + connect ( _update_timer, TQ_SIGNAL ( timeout () ), this, TQ_SLOT ( logoMove () ) ); TQCursor kbfxCursor; kbfxCursor.setShape ( TQt::PointingHandCursor ); -- cgit v1.2.1