TDE
/
tastymenu
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tastymenu
0
0
Fork 0
Code Issues Releases Wiki Activity

Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/8/head
Michele Calgaro 10 months ago
parent 687b219ed6
commit 12fe60049b
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
4 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File

90
src/menuhandler.cpp
Unescape View File

@ -51,10 +51,10 @@ MenuHandler::MenuHandler( TQWidget *parent, Prefs *prefs, char *name, WFlags fl)
kickerConfWatch = new KDirWatch( this );
kickerConfWatch->addFile(kickerConfPath);
connect( kickerConfWatch, SIGNAL(dirty(const TQString&)), this,
SLOT(slotModKickerConf()) );
connect( kickerConfWatch, SIGNAL(dirty(const TQString&)), this,
SIGNAL(kickerConfChanged()) );
connect( kickerConfWatch, TQ_SIGNAL(dirty(const TQString&)), this,
TQ_SLOT(slotModKickerConf()) );
connect( kickerConfWatch, TQ_SIGNAL(dirty(const TQString&)), this,
TQ_SIGNAL(kickerConfChanged()) );
if( _newAppsNotification = prefSkel->newAppsNotification() )
{
@ -91,10 +91,10 @@ MenuHandler::MenuHandler( TQWidget *parent, Prefs *prefs, char *name, WFlags fl)
icon = iconLoader->loadIcon("clear_left", TDEIcon::Small);
menu->clearButton->setIconSet(icon);
connect(menu->clearButton, SIGNAL(clicked()), menu->searchLine, SLOT (clear()) );
connect(menu->clearButton, TQ_SIGNAL(clicked()), menu->searchLine, TQ_SLOT (clear()) );
menu->detachButton->setIconSet(TQPixmap(uic_findImage("detach.png")));
connect(menu->detachButton, SIGNAL(clicked()), this, SLOT (switchWindowMode()) );
connect(menu->detachButton, TQ_SIGNAL(clicked()), this, TQ_SLOT (switchWindowMode()) );
menu->searchLine->setContextMenuEnabled(false);
@ -145,39 +145,39 @@ MenuHandler::MenuHandler( TQWidget *parent, Prefs *prefs, char *name, WFlags fl)
//left/middle mouse button
connect (menu->dynamicList,
SIGNAL (activated(TQListViewItem *, const TQPoint & , int )), this,
SLOT (dynListClicked(TQListViewItem *, const TQPoint &, int)));
TQ_SIGNAL (activated(TQListViewItem *, const TQPoint & , int )), this,
TQ_SLOT (dynListClicked(TQListViewItem *, const TQPoint &, int)));
connect (menu->rootList,
SIGNAL (activated(TQListViewItem *, const TQPoint & , int )), this,
SLOT (rootListClicked(TQListViewItem *, const TQPoint &, int)));
TQ_SIGNAL (activated(TQListViewItem *, const TQPoint & , int )), this,
TQ_SLOT (rootListClicked(TQListViewItem *, const TQPoint &, int)));
connect (menu->childList,
SIGNAL (activated(TQListViewItem *, const TQPoint & , int )), this,
SLOT (childListClicked(TQListViewItem *, const TQPoint &, int)));
TQ_SIGNAL (activated(TQListViewItem *, const TQPoint & , int )), this,
TQ_SLOT (childListClicked(TQListViewItem *, const TQPoint &, int)));
//right mouse button
connect (menu->dynamicList,
SIGNAL (contextMenuRequested(TQListViewItem *, const TQPoint & , int )), this,
SLOT (slotContextMenu(TQListViewItem *, const TQPoint &, int)));
TQ_SIGNAL (contextMenuRequested(TQListViewItem *, const TQPoint & , int )), this,
TQ_SLOT (slotContextMenu(TQListViewItem *, const TQPoint &, int)));
connect (menu->rootList,
SIGNAL (contextMenuRequested(TQListViewItem *, const TQPoint & , int )), this,
SLOT (slotContextMenu(TQListViewItem *, const TQPoint &, int)));
TQ_SIGNAL (contextMenuRequested(TQListViewItem *, const TQPoint & , int )), this,
TQ_SLOT (slotContextMenu(TQListViewItem *, const TQPoint &, int)));
connect (menu->childList,
SIGNAL (contextMenuRequested(TQListViewItem *, const TQPoint & , int )), this,
SLOT (slotContextMenu(TQListViewItem *, const TQPoint &, int)));
TQ_SIGNAL (contextMenuRequested(TQListViewItem *, const TQPoint & , int )), this,
TQ_SLOT (slotContextMenu(TQListViewItem *, const TQPoint &, int)));
//don't open categories on mouseover on childlist
//menu->childList->setEasyOpen( true );
connect (menu->clearRecentButton, SIGNAL (clicked()), this, SLOT (clearDynList()));
connect (menu->logoutButton, SIGNAL (clicked()), this, SLOT (doLogout()));
connect (menu->lockButton, SIGNAL (clicked()), this, SLOT (doLock()));
connect (menu->runButton, SIGNAL (clicked()), this, SLOT (runDialog()));
connect (menu->clearRecentButton, TQ_SIGNAL (clicked()), this, TQ_SLOT (clearDynList()));
connect (menu->logoutButton, TQ_SIGNAL (clicked()), this, TQ_SLOT (doLogout()));
connect (menu->lockButton, TQ_SIGNAL (clicked()), this, TQ_SLOT (doLock()));
connect (menu->runButton, TQ_SIGNAL (clicked()), this, TQ_SLOT (runDialog()));
connect( sessionsMenu, SIGNAL(aboutToShow()), SLOT(slotPopulateSessions()) );
connect( sessionsMenu, SIGNAL(activated(int)), SLOT(slotSessionActivated(int)) );
connect( sessionsMenu, TQ_SIGNAL(aboutToShow()), TQ_SLOT(slotPopulateSessions()) );
connect( sessionsMenu, TQ_SIGNAL(activated(int)), TQ_SLOT(slotSessionActivated(int)) );
connect( menu->menuModes, SIGNAL(activated(int)), SLOT(menuModeChanged(int)) );
connect( menu->menuModes, TQ_SIGNAL(activated(int)), TQ_SLOT(menuModeChanged(int)) );
menuModeChanged(_menuMode);
}
@ -207,16 +207,16 @@ void MenuHandler::loadNewInstalledApps()
}
firstListing += appDirs.count();
connect( xdgMenuLister, SIGNAL(newItems(const KFileItemList &)), this,
SLOT(slotApplicationsAdded(const KFileItemList &)) );
connect( xdgMenuLister, SIGNAL(deleteItem( KFileItem *)), this,
SLOT(slotApplicationRemoved()) );
connect( xdgMenuLister, TQ_SIGNAL(newItems(const KFileItemList &)), this,
TQ_SLOT(slotApplicationsAdded(const KFileItemList &)) );
connect( xdgMenuLister, TQ_SIGNAL(deleteItem( KFileItem *)), this,
TQ_SLOT(slotApplicationRemoved()) );
xdgMenuWatch = new KDirWatch(this);
xdgMenuWatch->addFile(locateLocal("xdgconf-menu", "applications-kmenuedit.menu"));
//connect with slotApplicationRemoved() because we need to wait a while...
connect( xdgMenuWatch, SIGNAL(dirty(const TQString&)), this,
SLOT(slotApplicationRemoved()) );
connect( xdgMenuWatch, TQ_SIGNAL(dirty(const TQString&)), this,
TQ_SLOT(slotApplicationRemoved()) );
newInstalledList = prefSkel->newInstalledApps();
newInstalledTimeStamps = prefSkel->newInstalledAppsTimeStamps();
@ -247,8 +247,8 @@ void MenuHandler::setupColumns()
//manage drag'n drop
menu->dynamicList->setAcceptDrops(true);
menu->dynamicList->setDragEnabled(true);
connect( menu->dynamicList, SIGNAL(moved()),
this, SLOT(dynListElemMoved()) );
connect( menu->dynamicList, TQ_SIGNAL(moved()),
this, TQ_SLOT(dynListElemMoved()) );
menu->rootList->header()->hide();
menu->rootList->setResizeMode(TQListView::AllColumns);
@ -466,19 +466,19 @@ void MenuHandler::readConfig()
if( !_strigiIntegration )
{
//menu->searchLine->setListView((TDEListView *)(menu->dynamicList));
disconnect(menu->searchLine, SIGNAL(returnPressed( const TQString &)),
this, SLOT (strigiSearch( const TQString &)) );
connect(menu->searchLine, SIGNAL(textChanged( const TQString &)),
this, SLOT (initializeSearch( const TQString &)) );
disconnect(menu->searchLine, TQ_SIGNAL(returnPressed( const TQString &)),
this, TQ_SLOT (strigiSearch( const TQString &)) );
connect(menu->searchLine, TQ_SIGNAL(textChanged( const TQString &)),
this, TQ_SLOT (initializeSearch( const TQString &)) );
}
else //strigi
{
menu->searchLine->setListView(NULL);
menu->searchLine->setEnabled(true);
disconnect(menu->searchLine, SIGNAL(textChanged( const TQString &)),
this, SLOT (initializeSearch( const TQString &)) );
connect(menu->searchLine, SIGNAL(returnPressed( const TQString &)),
this, SLOT (strigiSearch( const TQString &)) );
disconnect(menu->searchLine, TQ_SIGNAL(textChanged( const TQString &)),
this, TQ_SLOT (initializeSearch( const TQString &)) );
connect(menu->searchLine, TQ_SIGNAL(returnPressed( const TQString &)),
this, TQ_SLOT (strigiSearch( const TQString &)) );
menu->searchLine->setContextMenuEnabled(false);
}
}
@ -510,7 +510,7 @@ void MenuHandler::mousePressEvent( TQMouseEvent *e)
else if(!_isNormalWindow && !(rect().contains(e->pos())) )
{
hide();
TQTimer::singleShot(200, this,SLOT(close()));
TQTimer::singleShot(200, this,TQ_SLOT(close()));
}
}
@ -529,7 +529,7 @@ void MenuHandler::closeEvent ( TQCloseEvent *e)
//HACK: I wait a little bit to permit closing the menu
// when user clicks on the menu button again
TQTimer::singleShot(50, this, SLOT(hide()));
TQTimer::singleShot(50, this, TQ_SLOT(hide()));
emit(hidden());
}
@ -1185,13 +1185,13 @@ void MenuHandler::slotApplicationsAdded(const KFileItemList & newItems)
//It's necessary to wait some seconds, otherwise apps won't be listed
//I do it two times for being sure, because I still haven't the clear idea
//where the right files to watch are...
TQTimer::singleShot(15000, this, SLOT(slotUpdateApplications()));
TQTimer::singleShot(15000, this, TQ_SLOT(slotUpdateApplications()));
}
void MenuHandler::slotApplicationRemoved()
{
TQTimer::singleShot(15000, this, SLOT(slotUpdateApplications()));
TQTimer::singleShot(15000, this, TQ_SLOT(slotUpdateApplications()));
slotUpdateApplications();
}

4
src/tastylistview.cpp
Unescape View File

@ -44,8 +44,8 @@ TastyListView::TastyListView( TQWidget * parent, const char * name)
listItemTip = new TastyListViewToolTip(viewport(), this);
connect(this, SIGNAL(onItem(TQListViewItem *) ), SLOT(slotOnItem(TQListViewItem *) ) );
connect(onItemTimer, SIGNAL(timeout()), this, SLOT(slotTimeout()) );
connect(this, TQ_SIGNAL(onItem(TQListViewItem *) ), TQ_SLOT(slotOnItem(TQListViewItem *) ) );
connect(onItemTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout()) );
}

20
src/tastymenu.cpp
Unescape View File

@ -62,8 +62,8 @@ TastyMenu::TastyMenu(const TQString& configFile, Type type, int actions, TQWidge
TQt::WType_Dialog :
TQt::WType_Popup|TQt::WNoAutoErase);
connect (button, SIGNAL (pressed()), this, SLOT (clickSlot ()));
connect (menuHandler, SIGNAL(hidden()), this, SLOT(setButtonUp()));
connect (button, TQ_SIGNAL (pressed()), this, TQ_SLOT (clickSlot ()));
connect (menuHandler, TQ_SIGNAL(hidden()), this, TQ_SLOT(setButtonUp()));
_menuButtonLabel = prefSkel->menuButtonLabel();
if(_menuButtonLabel.isEmpty())
button -> setTextLabel(i18n("Menu"), false);
@ -95,13 +95,13 @@ TastyMenu::TastyMenu(const TQString& configFile, Type type, int actions, TQWidge
if( _newAppsNotification )
{
setNewApplicationsMessage(prefSkel->newInstalledApps().count());
connect( menuHandler, SIGNAL(newApplications(int)),
this, SLOT(setNewApplicationsMessage(int)));
connect( menuHandler, TQ_SIGNAL(newApplications(int)),
this, TQ_SLOT(setNewApplicationsMessage(int)));
}
setGlobalAccel( prefSkel->overrideAltF1());
connect( menuHandler, SIGNAL(kickerConfChanged()),
this, SLOT(updateConfiguration()) );
connect( menuHandler, TQ_SIGNAL(kickerConfChanged()),
this, TQ_SLOT(updateConfiguration()) );
}
@ -175,7 +175,7 @@ void TastyMenu::clickSlot()
menuHandler->popup(menupos(menuHandler));
//TQTimer::singleShot( 10000, this, SLOT(setButtonUp()) );
//TQTimer::singleShot( 10000, this, TQ_SLOT(setButtonUp()) );
}
void TastyMenu::about()
@ -266,8 +266,8 @@ void TastyMenu::preferences()
TDEConfigDialog::Cancel );
dialog->addPage(appearanceDialog, i18n("Appearance"), "appearance" );
dialog->addPage(behaviourDialog, i18n("Behaviour"), "behaviour" );
connect( dialog, SIGNAL(settingsChanged()),
this, SLOT(updateConfiguration()) );
connect( dialog, TQ_SIGNAL(settingsChanged()),
this, TQ_SLOT(updateConfiguration()) );
dialog->show();
}
@ -276,7 +276,7 @@ void TastyMenu::setGlobalAccel( bool global )
globalAccel = new TDEGlobalAccel(this);
globalAccel->insert("Toggle Tasty Menu", i18n("Toggle Tasty Menu"),
i18n("Toggle Tasty Menu"),
0, 0, this, SLOT(clickSlot()));
0, 0, this, TQ_SLOT(clickSlot()));
globalAccel->readSettings();
globalAccel->updateConnections();

6
src/tastytooltip.cpp
Unescape View File

@ -59,7 +59,7 @@ TastyToolTip::~TastyToolTip()
void TastyToolTip::showTip(const TQPoint & point)
{
move(point);
TQTimer::singleShot(250, this, SLOT(show()));
TQTimer::singleShot(250, this, TQ_SLOT(show()));
}
void TastyToolTip::show()
@ -71,14 +71,14 @@ void TastyToolTip::show()
void TastyToolTip::hideTip( )
{
TQTimer::singleShot(250, this, SLOT(hide()));
TQTimer::singleShot(250, this, TQ_SLOT(hide()));
}
void TastyToolTip::notify(const TQPoint & point )
{
move(point);
show();
TQTimer::singleShot(5000, this, SLOT(hide()));
TQTimer::singleShot(5000, this, TQ_SLOT(hide()));
}
void TastyToolTip::setMessage( TQString message )

Write Preview
Loading…
Cancel
Save