summaryrefslogtreecommitdiffstats
path: root/kmenuedit
diff options
context:
space:
mode:
Diffstat (limited to 'kmenuedit')
-rw-r--r--kmenuedit/basictab.cpp58
-rw-r--r--kmenuedit/basictab.h2
-rw-r--r--kmenuedit/kcontrol_main.cpp12
-rw-r--r--kmenuedit/kmenuedit.cpp32
-rw-r--r--kmenuedit/kmenuedit.h2
-rw-r--r--kmenuedit/main.cpp12
-rw-r--r--kmenuedit/menufile.cpp4
-rw-r--r--kmenuedit/menuinfo.cpp12
-rw-r--r--kmenuedit/menuinfo.h6
-rw-r--r--kmenuedit/treeview.cpp62
-rw-r--r--kmenuedit/treeview.h6
11 files changed, 104 insertions, 104 deletions
diff --git a/kmenuedit/basictab.cpp b/kmenuedit/basictab.cpp
index 32dba3f3e..597ce4f81 100644
--- a/kmenuedit/basictab.cpp
+++ b/kmenuedit/basictab.cpp
@@ -27,19 +27,19 @@
#include <tqwhatsthis.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tdeglobal.h>
#include <kdialog.h>
#include <kkeybutton.h>
#include <klineedit.h>
#include <tdemessagebox.h>
#include <kicondialog.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
#include <kurlrequester.h>
#include <tdefiledialog.h>
#include <kcombobox.h>
#include <kkeydialog.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include "khotkeys.h"
#include "menuinfo.h"
@@ -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 );
@@ -337,7 +337,7 @@ void BasicTab::setEntryInfo(MenuEntryInfo *entryInfo)
return;
}
- KDesktopFile *df = entryInfo->desktopFile();
+ TDEDesktopFile *df = entryInfo->desktopFile();
_nameEdit->setText(df->readName());
_descriptionEdit->setText(df->readGenericName());
@@ -398,7 +398,7 @@ void BasicTab::apply()
_menuEntryInfo->setDescription(_descriptionEdit->text());
_menuEntryInfo->setIcon(_iconButton->icon());
- KDesktopFile *df = _menuEntryInfo->desktopFile();
+ TDEDesktopFile *df = _menuEntryInfo->desktopFile();
df->writeEntry("Comment", _commentEdit->text());
if (_systrayCB->isChecked())
df->writePathEntry("Exec", _execEdit->lineEdit()->text().prepend("ksystraycmd "));
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/kcontrol_main.cpp b/kmenuedit/kcontrol_main.cpp
index cd580e02e..1801e7709 100644
--- a/kmenuedit/kcontrol_main.cpp
+++ b/kmenuedit/kcontrol_main.cpp
@@ -21,18 +21,18 @@
#include <unistd.h>
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "kmenuedit.h"
static const char description[] = I18N_NOOP("TDE control center editor");
static const char version[] = "1.0";
-extern "C" int KDE_EXPORT kdemain( int argc, char **argv )
+extern "C" int TDE_EXPORT kdemain( int argc, char **argv )
{
TDELocale::setMainCatalogue("kmenuedit");
TDEAboutData aboutData("kcontroledit", I18N_NOOP("Trinity Control Center Editor"),
@@ -43,12 +43,12 @@ extern "C" int KDE_EXPORT kdemain( int argc, char **argv )
aboutData.addAuthor("Matthias Elter", I18N_NOOP("Original Author"), "elter@kde.org");
TDECmdLineArgs::init( argc, argv, &aboutData );
- KUniqueApplication::addCmdLineOptions();
+ TDEUniqueApplication::addCmdLineOptions();
- if (!KUniqueApplication::start())
+ if (!TDEUniqueApplication::start())
return 1;
- KUniqueApplication app;
+ TDEUniqueApplication app;
KMenuEdit *menuEdit = new KMenuEdit(true);
menuEdit->show();
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/main.cpp b/kmenuedit/main.cpp
index b78a71ef0..69440e946 100644
--- a/kmenuedit/main.cpp
+++ b/kmenuedit/main.cpp
@@ -20,7 +20,7 @@
#include <unistd.h>
-#include <kuniqueapplication.h>
+#include <tdeuniqueapplication.h>
#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
@@ -40,7 +40,7 @@ static const TDECmdLineOptions options[] =
static KMenuEdit *menuEdit = 0;
-class KMenuApplication : public KUniqueApplication
+class KMenuApplication : public TDEUniqueApplication
{
public:
KMenuApplication() { }
@@ -57,12 +57,12 @@ public:
menuEdit->selectMenuEntry(TQString::fromLocal8Bit(args->arg(1)));
}
}
- return KUniqueApplication::newInstance();
+ return TDEUniqueApplication::newInstance();
}
};
-extern "C" int KDE_EXPORT kdemain( int argc, char **argv )
+extern "C" int TDE_EXPORT kdemain( int argc, char **argv )
{
TDEAboutData aboutData("kmenuedit", I18N_NOOP("TDE Menu Editor"),
version, description, TDEAboutData::License_GPL,
@@ -72,10 +72,10 @@ extern "C" int KDE_EXPORT kdemain( int argc, char **argv )
aboutData.addAuthor("Matthias Elter", I18N_NOOP("Original Author"), "elter@kde.org");
TDECmdLineArgs::init( argc, argv, &aboutData );
- KUniqueApplication::addCmdLineOptions();
+ TDEUniqueApplication::addCmdLineOptions();
TDECmdLineArgs::addCmdLineOptions( options );
- if (!KUniqueApplication::start())
+ if (!TDEUniqueApplication::start())
return 1;
KMenuApplication app;
diff --git a/kmenuedit/menufile.cpp b/kmenuedit/menufile.cpp
index 2322cc31d..612da6cd1 100644
--- a/kmenuedit/menufile.cpp
+++ b/kmenuedit/menufile.cpp
@@ -23,7 +23,7 @@
#include <kdebug.h>
#include <tdeglobal.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include "menufile.h"
@@ -188,7 +188,7 @@ TQDomElement MenuFile::findMenu(TQDomElement elem, const TQString &menuName, boo
static TQString entryToDirId(const TQString &path)
{
- // See also KDesktopFile::locateLocal
+ // See also TDEDesktopFile::locateLocal
TQString local;
if (path.startsWith("/"))
{
diff --git a/kmenuedit/menuinfo.cpp b/kmenuedit/menuinfo.cpp
index 03c3a2e57..c6fe00a12 100644
--- a/kmenuedit/menuinfo.cpp
+++ b/kmenuedit/menuinfo.cpp
@@ -22,9 +22,9 @@
#include <tqregexp.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
#include <khotkeys.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
//
// MenuFolderInfo
@@ -191,7 +191,7 @@ void MenuFolderInfo::save(MenuFile *menuFile)
if (dirty)
{
- TQString local = KDesktopFile::locateLocal(directoryFile);
+ TQString local = TDEDesktopFile::locateLocal(directoryFile);
TDEConfig *df = 0;
if (directoryFile != local)
@@ -305,11 +305,11 @@ MenuEntryInfo::~MenuEntryInfo()
delete df;
}
-KDesktopFile *MenuEntryInfo::desktopFile()
+TDEDesktopFile *MenuEntryInfo::desktopFile()
{
if (!df)
{
- df = new KDesktopFile(service->desktopEntryPath());
+ df = new TDEDesktopFile(service->desktopEntryPath());
}
return df;
}
@@ -323,7 +323,7 @@ void MenuEntryInfo::setDirty()
TQString local = locateLocal("xdgdata-apps", service->menuId());
if (local != service->desktopEntryPath())
{
- KDesktopFile *oldDf = desktopFile();
+ TDEDesktopFile *oldDf = desktopFile();
df = oldDf->copyTo(local);
df->setDesktopGroup();
delete oldDf;
diff --git a/kmenuedit/menuinfo.h b/kmenuedit/menuinfo.h
index 9497022d0..f766e4612 100644
--- a/kmenuedit/menuinfo.h
+++ b/kmenuedit/menuinfo.h
@@ -142,7 +142,7 @@ public:
class MenuEntryInfo : public MenuInfo
{
public:
- MenuEntryInfo(const KService::Ptr &_service, KDesktopFile *_df = 0)
+ MenuEntryInfo(const KService::Ptr &_service, TDEDesktopFile *_df = 0)
: service(_service), df(_df),
shortcutLoaded(false), shortcutDirty(false), dirty(_df != 0), hidden(false)
{
@@ -174,14 +174,14 @@ public:
void save();
- KDesktopFile *desktopFile();
+ TDEDesktopFile *desktopFile();
public:
TQString caption;
TQString description;
TQString icon;
KService::Ptr service;
- KDesktopFile *df;
+ TDEDesktopFile *df;
TDEShortcut shortCut;
bool shortcutLoaded;
bool shortcutDirty;
diff --git a/kmenuedit/treeview.cpp b/kmenuedit/treeview.cpp
index 7f7e31dce..304d95e42 100644
--- a/kmenuedit/treeview.cpp
+++ b/kmenuedit/treeview.cpp
@@ -34,13 +34,13 @@
#include <tqstringlist.h>
#include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kinputdialog.h>
#include <tdelocale.h>
-#include <ksimpleconfig.h>
+#include <tdesimpleconfig.h>
#include <kdebug.h>
#include <kiconloader.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
#include <tdeaction.h>
#include <tdemessagebox.h>
#include <tdeapplication.h>
@@ -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,13 +310,13 @@ 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();
}
-TQString TreeView::findName(KDesktopFile *df, bool deleted)
+TQString TreeView::findName(TDEDesktopFile *df, bool deleted)
{
TQString name = df->readName();
if (deleted)
@@ -340,7 +340,7 @@ TQString TreeView::findName(KDesktopFile *df, bool deleted)
continue;
}
- KDesktopFile df2(*it);
+ TDEDesktopFile df2(*it);
name = df2.readName();
if (!name.isEmpty() && (name != "empty"))
@@ -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)
{
@@ -692,10 +692,10 @@ static TQString createDesktopFile(const TQString &file, TQString *menuId, TQStri
return result;
}
-static KDesktopFile *copyDesktopFile(MenuEntryInfo *entryInfo, TQString *menuId, TQStringList *excludeList)
+static TDEDesktopFile *copyDesktopFile(MenuEntryInfo *entryInfo, TQString *menuId, TQStringList *excludeList)
{
TQString result = createDesktopFile(entryInfo->file(), menuId, excludeList);
- KDesktopFile *df = entryInfo->desktopFile()->copyTo(result);
+ TDEDesktopFile *df = entryInfo->desktopFile()->copyTo(result);
df->deleteEntry("Categories"); // Don't set any categories!
return df;
@@ -749,8 +749,8 @@ void TreeView::slotDropped (TQDropEvent * e, TQListViewItem *parent, TQListViewI
TQString menuId;
TQString result = createDesktopFile(path, &menuId, &m_newMenuIds);
- KDesktopFile orig_df(path);
- KDesktopFile *df = orig_df.copyTo(result);
+ TDEDesktopFile orig_df(path);
+ TDEDesktopFile *df = orig_df.copyTo(result);
df->deleteEntry("Categories"); // Don't set any categories!
KService *s = new KService(df);
@@ -869,7 +869,7 @@ void TreeView::slotDropped (TQDropEvent * e, TQListViewItem *parent, TQListViewI
{
// Need to copy file and then add it
- KDesktopFile *df = copyDesktopFile(entryInfo, &menuId, &m_newMenuIds); // Duplicate
+ TDEDesktopFile *df = copyDesktopFile(entryInfo, &menuId, &m_newMenuIds); // Duplicate
//UNDO-ACTION: NEW_MENU_ID (menuId)
KService *s = new KService(df);
@@ -1030,7 +1030,7 @@ void TreeView::newsubmenu()
folderInfo->hidden = false;
folderInfo->setDirty();
- KDesktopFile *df = new KDesktopFile(file);
+ TDEDesktopFile *df = new TDEDesktopFile(file);
df->writeEntry("Name", folderInfo->caption);
df->writeEntry("Icon", folderInfo->icon);
df->sync();
@@ -1073,7 +1073,7 @@ void TreeView::newitem()
file = createDesktopFile(file, &menuId, &m_newMenuIds); // Create
- KDesktopFile *df = new KDesktopFile(file);
+ TDEDesktopFile *df = new TDEDesktopFile(file);
df->writeEntry("Name", caption);
df->writeEntry("Type", "Application");
@@ -1314,7 +1314,7 @@ void TreeView::paste()
if (command == COPY_FILE)
{
// Need to copy file and then add it
- KDesktopFile *df = copyDesktopFile(entryInfo, &menuId, &m_newMenuIds); // Duplicate
+ TDEDesktopFile *df = copyDesktopFile(entryInfo, &menuId, &m_newMenuIds); // Duplicate
KService *s = new KService(df);
s->setMenuId(menuId);
diff --git a/kmenuedit/treeview.h b/kmenuedit/treeview.h
index 3370f5bc2..329dbcf9e 100644
--- a/kmenuedit/treeview.h
+++ b/kmenuedit/treeview.h
@@ -29,7 +29,7 @@
class TQPopupMenu;
class TDEActionCollection;
-class KDesktopFile;
+class TDEDesktopFile;
class MenuFile;
class MenuFolderInfo;
class MenuEntryInfo;
@@ -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();
@@ -133,7 +133,7 @@ protected:
void del(TreeItem *, bool deleteInfo);
void fill();
void fillBranch(MenuFolderInfo *folderInfo, TreeItem *parent);
- TQString findName(KDesktopFile *df, bool deleted);
+ TQString findName(TDEDesktopFile *df, bool deleted);
void closeAllItems(TQListViewItem *item);
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-13 04:47:38 +0000