summaryrefslogtreecommitdiffstats
path: root/kmenuedit
diff options
context:
space:
mode:
Diffstat (limited to 'kmenuedit')
-rw-r--r--kmenuedit/basictab.cpp48
-rw-r--r--kmenuedit/basictab.h2
-rw-r--r--kmenuedit/kmenuedit.cpp32
-rw-r--r--kmenuedit/kmenuedit.h2
-rw-r--r--kmenuedit/treeview.cpp36
-rw-r--r--kmenuedit/treeview.h2
6 files changed, 61 insertions, 61 deletions
diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp
index 32dba3f3e..1cde09440 100644
--- a/kmenuedit/basictab.cpp
+++ b/kmenuedit/basictab.cpp
@@ -101,18 +101,18 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
grid->addWidget(_execLabel, 3, 0);
// connect line inputs
- connect(_nameEdit, TQT_SIGNAL(textChanged(const TQString&)),
- TQT_SLOT(slotChanged()));
- connect(_descriptionEdit, TQT_SIGNAL(textChanged(const TQString&)),
- TQT_SLOT(slotChanged()));
- connect(_commentEdit, TQT_SIGNAL(textChanged(const TQString&)),
- TQT_SLOT(slotChanged()));
- connect(_execEdit, TQT_SIGNAL(textChanged(const TQString&)),
- TQT_SLOT(slotChanged()));
- connect(_execEdit, TQT_SIGNAL(urlSelected(const TQString&)),
- TQT_SLOT(slotExecSelected()));
- connect(_launchCB, TQT_SIGNAL(clicked()), TQT_SLOT(launchcb_clicked()));
- connect(_systrayCB, TQT_SIGNAL(clicked()), TQT_SLOT(systraycb_clicked()));
+ connect(_nameEdit, TQ_SIGNAL(textChanged(const TQString&)),
+ TQ_SLOT(slotChanged()));
+ connect(_descriptionEdit, TQ_SIGNAL(textChanged(const TQString&)),
+ TQ_SLOT(slotChanged()));
+ connect(_commentEdit, TQ_SIGNAL(textChanged(const TQString&)),
+ TQ_SLOT(slotChanged()));
+ connect(_execEdit, TQ_SIGNAL(textChanged(const TQString&)),
+ TQ_SLOT(slotChanged()));
+ connect(_execEdit, TQ_SIGNAL(urlSelected(const TQString&)),
+ TQ_SLOT(slotExecSelected()));
+ connect(_launchCB, TQ_SIGNAL(clicked()), TQ_SLOT(launchcb_clicked()));
+ connect(_systrayCB, TQ_SIGNAL(clicked()), TQ_SLOT(systraycb_clicked()));
// add line inputs to the grid
grid->addMultiCellWidget(_nameEdit, 0, 0, 1, 1);
@@ -126,7 +126,7 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
_iconButton = new TDEIconButton(general_group);
_iconButton->setFixedSize(56,56);
_iconButton->setIconSize(48);
- connect(_iconButton, TQT_SIGNAL(iconChanged(TQString)), TQT_SLOT(slotChanged()));
+ connect(_iconButton, TQ_SIGNAL(iconChanged(TQString)), TQ_SLOT(slotChanged()));
grid->addMultiCellWidget(_iconButton, 0, 1, 2, 2);
// add the general group to the main layout
@@ -148,8 +148,8 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
_pathLabel->setBuddy(_pathEdit);
- connect(_pathEdit, TQT_SIGNAL(textChanged(const TQString&)),
- TQT_SLOT(slotChanged()));
+ connect(_pathEdit, TQ_SIGNAL(textChanged(const TQString&)),
+ TQ_SLOT(slotChanged()));
vbox->addWidget(hbox);
layout->addMultiCellWidget(_path_group, 1, 1, 0, 1);
@@ -159,7 +159,7 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
KDialog::spacingHint());
_terminalCB = new TQCheckBox(i18n("Run in term&inal"), _term_group);
- connect(_terminalCB, TQT_SIGNAL(clicked()), TQT_SLOT(termcb_clicked()));
+ connect(_terminalCB, TQ_SIGNAL(clicked()), TQ_SLOT(termcb_clicked()));
vbox->addWidget(_terminalCB);
hbox = new TQHBox(_term_group);
@@ -169,8 +169,8 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
_termOptEdit->setAcceptDrops(false);
_termOptLabel->setBuddy(_termOptEdit);
- connect(_termOptEdit, TQT_SIGNAL(textChanged(const TQString&)),
- TQT_SLOT(slotChanged()));
+ connect(_termOptEdit, TQ_SIGNAL(textChanged(const TQString&)),
+ TQ_SLOT(slotChanged()));
vbox->addWidget(hbox);
layout->addMultiCellWidget(_term_group, 2, 2, 0, 1);
@@ -182,7 +182,7 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
KDialog::spacingHint());
_uidCB = new TQCheckBox(i18n("&Run as a different user"), _uid_group);
- connect(_uidCB, TQT_SIGNAL(clicked()), TQT_SLOT(uidcb_clicked()));
+ connect(_uidCB, TQ_SIGNAL(clicked()), TQ_SLOT(uidcb_clicked()));
vbox->addWidget(_uidCB);
hbox = new TQHBox(_uid_group);
@@ -192,8 +192,8 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
_uidEdit->setAcceptDrops(false);
_uidLabel->setBuddy(_uidEdit);
- connect(_uidEdit, TQT_SIGNAL(textChanged(const TQString&)),
- TQT_SLOT(slotChanged()));
+ connect(_uidEdit, TQ_SIGNAL(textChanged(const TQString&)),
+ TQ_SLOT(slotChanged()));
vbox->addWidget(hbox);
layout->addMultiCellWidget(_uid_group, 3, 3, 0, 1);
@@ -216,11 +216,11 @@ BasicTab::BasicTab( TQWidget *parent, const char *name )
//_keyEdit->setText( "" );
//TQPushButton* _keyButton = new TQPushButton( i18n( "Change" ),
// general_group_keybind );
- //connect( _keyButton, TQT_SIGNAL( clicked()), this, TQT_SLOT( keyButtonPressed()));
+ //connect( _keyButton, TQ_SIGNAL( clicked()), this, TQ_SLOT( keyButtonPressed()));
_keyEdit = new KKeyButton(general_group_keybind);
grid_keybind->addWidget(new TQLabel(_keyEdit, i18n("Current shortcut &key:"), general_group_keybind), 0, 0);
- connect( _keyEdit, TQT_SIGNAL(capturedShortcut(const TDEShortcut&)),
- this, TQT_SLOT(slotCapturedShortcut(const TDEShortcut&)));
+ connect( _keyEdit, TQ_SIGNAL(capturedShortcut(const TDEShortcut&)),
+ this, TQ_SLOT(slotCapturedShortcut(const TDEShortcut&)));
grid_keybind->addWidget(_keyEdit, 0, 1);
//grid_keybind->addWidget(_keyButton, 0, 2 );
diff --git a/kmenuedit/basictab.h b/kmenuedit/basictab.h
index 724f1f339..89f7cd660 100644
--- a/kmenuedit/basictab.h
+++ b/kmenuedit/basictab.h
@@ -40,7 +40,7 @@ class MenuEntryInfo;
class BasicTab : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
BasicTab( TQWidget *parent=0, const char *name=0 );
diff --git a/kmenuedit/kmenuedit.cpp b/kmenuedit/kmenuedit.cpp
index 8a90cfcd0..282c9843c 100644
--- a/kmenuedit/kmenuedit.cpp
+++ b/kmenuedit/kmenuedit.cpp
@@ -67,12 +67,12 @@ void KMenuEdit::setupActions()
if (!m_controlCenter)
(void)new TDEAction(i18n("New S&eparator"), "menu_new_sep", 0, actionCollection(), "newsep");
- (void)new TDEAction(i18n("Save && Quit"), "filesave_and_close", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSave_and_close()), actionCollection(), "file_save_and_quit");
+ (void)new TDEAction(i18n("Save && Quit"), "filesave_and_close", 0, this, TQ_SLOT( slotSave_and_close()), actionCollection(), "file_save_and_quit");
m_actionDelete = 0;
- KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT( slotSave() ), actionCollection());
- KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection());
+ KStdAction::save(this, TQ_SLOT( slotSave() ), actionCollection());
+ KStdAction::quit(this, TQ_SLOT( close() ), actionCollection());
KStdAction::cut(0, 0, actionCollection());
KStdAction::copy(0, 0, actionCollection());
KStdAction::paste(0, 0, actionCollection());
@@ -80,25 +80,25 @@ void KMenuEdit::setupActions()
void KMenuEdit::setupView()
{
- m_splitter = new TQSplitter(Qt::Horizontal, this);
+ m_splitter = new TQSplitter(TQt::Horizontal, this);
m_tree = new TreeView(m_controlCenter, actionCollection(), m_splitter);
m_basicTab = new BasicTab(m_splitter);
- connect(m_tree, TQT_SIGNAL(entrySelected(MenuFolderInfo *)),
- m_basicTab, TQT_SLOT(setFolderInfo(MenuFolderInfo *)));
- connect(m_tree, TQT_SIGNAL(entrySelected(MenuEntryInfo *)),
- m_basicTab, TQT_SLOT(setEntryInfo(MenuEntryInfo *)));
- connect(m_tree, TQT_SIGNAL(disableAction()),
- m_basicTab, TQT_SLOT(slotDisableAction() ) );
+ connect(m_tree, TQ_SIGNAL(entrySelected(MenuFolderInfo *)),
+ m_basicTab, TQ_SLOT(setFolderInfo(MenuFolderInfo *)));
+ connect(m_tree, TQ_SIGNAL(entrySelected(MenuEntryInfo *)),
+ m_basicTab, TQ_SLOT(setEntryInfo(MenuEntryInfo *)));
+ connect(m_tree, TQ_SIGNAL(disableAction()),
+ m_basicTab, TQ_SLOT(slotDisableAction() ) );
- connect(m_basicTab, TQT_SIGNAL(changed(MenuFolderInfo *)),
- m_tree, TQT_SLOT(currentChanged(MenuFolderInfo *)));
+ connect(m_basicTab, TQ_SIGNAL(changed(MenuFolderInfo *)),
+ m_tree, TQ_SLOT(currentChanged(MenuFolderInfo *)));
- connect(m_basicTab, TQT_SIGNAL(changed(MenuEntryInfo *)),
- m_tree, TQT_SLOT(currentChanged(MenuEntryInfo *)));
+ connect(m_basicTab, TQ_SIGNAL(changed(MenuEntryInfo *)),
+ m_tree, TQ_SLOT(currentChanged(MenuEntryInfo *)));
- connect(m_basicTab, TQT_SIGNAL(findServiceShortcut(const TDEShortcut&, KService::Ptr &)),
- m_tree, TQT_SLOT(findServiceShortcut(const TDEShortcut&, KService::Ptr &)));
+ connect(m_basicTab, TQ_SIGNAL(findServiceShortcut(const TDEShortcut&, KService::Ptr &)),
+ m_tree, TQ_SLOT(findServiceShortcut(const TDEShortcut&, KService::Ptr &)));
// restore splitter sizes
TDEConfig* config = TDEGlobal::config();
diff --git a/kmenuedit/kmenuedit.h b/kmenuedit/kmenuedit.h
index 15e5c797f..f08247ebd 100644
--- a/kmenuedit/kmenuedit.h
+++ b/kmenuedit/kmenuedit.h
@@ -30,7 +30,7 @@ class TDEToggleAction;
class KMenuEdit : public TDEMainWindow
{
- Q_OBJECT
+ TQ_OBJECT
public:
KMenuEdit( bool controlCenter, TQWidget *parent=0, const char *name=0 );
diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp
index 7f7e31dce..8340b4090 100644
--- a/kmenuedit/treeview.cpp
+++ b/kmenuedit/treeview.cpp
@@ -163,23 +163,23 @@ TreeView::TreeView( bool controlCenter, TDEActionCollection *ac, TQWidget *paren
addColumn("");
header()->hide();
- connect(this, TQT_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)),
- TQT_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)));
+ connect(this, TQ_SIGNAL(dropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)),
+ TQ_SLOT(slotDropped(TQDropEvent*, TQListViewItem*, TQListViewItem*)));
- connect(this, TQT_SIGNAL(clicked( TQListViewItem* )),
- TQT_SLOT(itemSelected( TQListViewItem* )));
+ connect(this, TQ_SIGNAL(clicked( TQListViewItem* )),
+ TQ_SLOT(itemSelected( TQListViewItem* )));
- connect(this,TQT_SIGNAL(selectionChanged ( TQListViewItem * )),
- TQT_SLOT(itemSelected( TQListViewItem* )));
+ connect(this,TQ_SIGNAL(selectionChanged ( TQListViewItem * )),
+ TQ_SLOT(itemSelected( TQListViewItem* )));
- connect(this, TQT_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)),
- TQT_SLOT(slotRMBPressed(TQListViewItem*, const TQPoint&)));
+ connect(this, TQ_SIGNAL(rightButtonPressed(TQListViewItem*, const TQPoint&, int)),
+ TQ_SLOT(slotRMBPressed(TQListViewItem*, const TQPoint&)));
// connect actions
- connect(m_ac->action("newitem"), TQT_SIGNAL(activated()), TQT_SLOT(newitem()));
- connect(m_ac->action("newsubmenu"), TQT_SIGNAL(activated()), TQT_SLOT(newsubmenu()));
+ connect(m_ac->action("newitem"), TQ_SIGNAL(activated()), TQ_SLOT(newitem()));
+ connect(m_ac->action("newsubmenu"), TQ_SIGNAL(activated()), TQ_SLOT(newsubmenu()));
if (m_ac->action("newsep"))
- connect(m_ac->action("newsep"), TQT_SIGNAL(activated()), TQT_SLOT(newsep()));
+ connect(m_ac->action("newsep"), TQ_SIGNAL(activated()), TQ_SLOT(newsep()));
m_menuFile = new MenuFile( locateLocal("xdgconf-menu", "applications-tdemenuedit.menu"));
m_rootFolder = new MenuFolderInfo;
@@ -215,21 +215,21 @@ void TreeView::setViewMode(bool showHidden)
if(action) {
action->plug(m_rmb);
action->setEnabled(false);
- connect(action, TQT_SIGNAL(activated()), TQT_SLOT(cut()));
+ connect(action, TQ_SIGNAL(activated()), TQ_SLOT(cut()));
}
action = m_ac->action("edit_copy");
if(action) {
action->plug(m_rmb);
action->setEnabled(false);
- connect(action, TQT_SIGNAL(activated()), TQT_SLOT(copy()));
+ connect(action, TQ_SIGNAL(activated()), TQ_SLOT(copy()));
}
action = m_ac->action("edit_paste");
if(action) {
action->plug(m_rmb);
action->setEnabled(false);
- connect(action, TQT_SIGNAL(activated()), TQT_SLOT(paste()));
+ connect(action, TQ_SIGNAL(activated()), TQ_SLOT(paste()));
}
m_rmb->insertSeparator();
@@ -238,7 +238,7 @@ void TreeView::setViewMode(bool showHidden)
if(action) {
action->plug(m_rmb);
action->setEnabled(false);
- connect(action, TQT_SIGNAL(activated()), TQT_SLOT(del()));
+ connect(action, TQ_SIGNAL(activated()), TQ_SLOT(del()));
}
m_rmb->insertSeparator();
@@ -310,7 +310,7 @@ void TreeView::readMenuFolderInfo(MenuFolderInfo *folderInfo, KServiceGroup::Ptr
void TreeView::fill()
{
- TQApplication::setOverrideCursor(Qt::WaitCursor);
+ TQApplication::setOverrideCursor(TQt::WaitCursor);
clear();
fillBranch(m_rootFolder, 0);
TQApplication::restoreOverrideCursor();
@@ -378,7 +378,7 @@ TreeItem *TreeView::createTreeItem(TreeItem *parent, TQListViewItem *after, Menu
else
item = new TreeItem(parent, after, entryInfo->menuId(),_init);
- QString name;
+ TQString name;
if (m_detailedMenuEntries && entryInfo->description.length() != 0)
{
@@ -566,7 +566,7 @@ void TreeView::currentChanged(MenuEntryInfo *entryInfo)
if (item == 0) return;
if (entryInfo == 0) return;
- QString name;
+ TQString name;
if (m_detailedMenuEntries && entryInfo->description.length() != 0)
{
diff --git a/kmenuedit/treeview.h b/kmenuedit/treeview.h
index 3370f5bc2..c456d1c9c 100644
--- a/kmenuedit/treeview.h
+++ b/kmenuedit/treeview.h
@@ -88,7 +88,7 @@ private:
class TreeView : public TDEListView
{
friend class TreeItem;
- Q_OBJECT
+ TQ_OBJECT
public:
TreeView(bool controlCenter, TDEActionCollection *ac, TQWidget *parent=0, const char *name=0);
~TreeView();