summaryrefslogtreecommitdiffstats
path: root/parts/tools
diff options
context:
space:
mode:
Diffstat (limited to 'parts/tools')
-rw-r--r--parts/tools/addtooldlg.ui4
-rw-r--r--parts/tools/addtooldlg.ui.h2
-rw-r--r--parts/tools/kapplicationtree.cpp8
-rw-r--r--parts/tools/kapplicationtree.h2
-rw-r--r--parts/tools/tools_part.cpp50
-rw-r--r--parts/tools/tools_part.h2
-rw-r--r--parts/tools/toolsconfig.cpp12
-rw-r--r--parts/tools/toolsconfig.h2
-rw-r--r--parts/tools/toolsconfigwidget.cpp8
-rw-r--r--parts/tools/toolsconfigwidget.h2
-rw-r--r--parts/tools/toolsconfigwidgetbase.ui4
11 files changed, 48 insertions, 48 deletions
diff --git a/parts/tools/addtooldlg.ui b/parts/tools/addtooldlg.ui
index ece7a089..79dd24ae 100644
--- a/parts/tools/addtooldlg.ui
+++ b/parts/tools/addtooldlg.ui
@@ -226,11 +226,11 @@ executed.&lt;/p&gt;</string>
<forwards>
<forward>class TQListViewItem;</forward>
</forwards>
-<Q_SLOTS>
+<slots>
<slot>init()</slot>
<slot returnType="TQString">getApp()</slot>
<slot access="private">treeSelectionChanged( TQListViewItem * lvi )</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
<includes>
diff --git a/parts/tools/addtooldlg.ui.h b/parts/tools/addtooldlg.ui.h
index fea69766..61b52809 100644
--- a/parts/tools/addtooldlg.ui.h
+++ b/parts/tools/addtooldlg.ui.h
@@ -12,7 +12,7 @@
void AddToolDialog::init()
{
- connect( tree, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(treeSelectionChanged(TQListViewItem*)) );
+ connect( tree, TQ_SIGNAL(selectionChanged(TQListViewItem*)), this, TQ_SLOT(treeSelectionChanged(TQListViewItem*)) );
tree->header()->hide();
}
diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp
index 8c13a4ea..cd587e96 100644
--- a/parts/tools/kapplicationtree.cpp
+++ b/parts/tools/kapplicationtree.cpp
@@ -36,7 +36,7 @@
#include <tdeapplication.h>
#include <kbuttonbox.h>
#include <kcombobox.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
#include <kdialog.h>
#include <tdeglobal.h>
#include <klineedit.h>
@@ -44,7 +44,7 @@
#include <kiconloader.h>
#include <kmimemagic.h>
#include <krun.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <kstringhandler.h>
#include <kuserprofile.h>
#include <kurlcompletion.h>
@@ -139,8 +139,8 @@ KDevApplicationTree::KDevApplicationTree( TQWidget *parent, const char* name )
addDesktopGroup( TQString() );
- connect( this, TQT_SIGNAL( currentChanged(TQListViewItem*) ), TQT_SLOT( slotItemHighlighted(TQListViewItem*) ) );
- connect( this, TQT_SIGNAL( selectionChanged(TQListViewItem*) ), TQT_SLOT( slotSelectionChanged(TQListViewItem*) ) );
+ connect( this, TQ_SIGNAL( currentChanged(TQListViewItem*) ), TQ_SLOT( slotItemHighlighted(TQListViewItem*) ) );
+ connect( this, TQ_SIGNAL( selectionChanged(TQListViewItem*) ), TQ_SLOT( slotSelectionChanged(TQListViewItem*) ) );
}
// ----------------------------------------------------------------------
diff --git a/parts/tools/kapplicationtree.h b/parts/tools/kapplicationtree.h
index 0ba2cc9f..ddd9f68a 100644
--- a/parts/tools/kapplicationtree.h
+++ b/parts/tools/kapplicationtree.h
@@ -73,7 +73,7 @@ protected:
*/
class KDevApplicationTree : public TDEListView
{
- Q_OBJECT
+ TQ_OBJECT
public:
KDevApplicationTree( TQWidget *parent, const char* name = 0 );
diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp
index 8734eadc..66fd442b 100644
--- a/parts/tools/tools_part.cpp
+++ b/parts/tools/tools_part.cpp
@@ -11,12 +11,12 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
#include <kdialogbase.h>
#include <kiconloader.h>
#include <tdelocale.h>
#include <tdeparts/part.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tdetexteditor/document.h>
#include "kdevcore.h"
@@ -34,13 +34,13 @@
#define TOOLSSETTINGS 1
#define EXTRATOOLSSETTINGS 2
-static const KDevPluginInfo data("kdevtools");
-K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( data ) )
+static const KDevPluginInfo pluginData("kdevtools");
+K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( pluginData ) )
TQMap<int, TQString> externalToolMenuEntries;
ToolsPart::ToolsPart(TQObject *parent, const char *name, const TQStringList &)
- : KDevPlugin( &data, parent, name ? name : "ToolsPart")
+ : KDevPlugin( &pluginData, parent, name ? name : "ToolsPart")
{
setInstance(ToolsFactory::instance());
@@ -49,17 +49,17 @@ ToolsPart::ToolsPart(TQObject *parent, const char *name, const TQStringList &)
m_configProxy = new ConfigWidgetProxy( core() );
m_configProxy->createGlobalConfigPage( i18n("Tools Menu"), TOOLSSETTINGS, info()->icon() );
m_configProxy->createGlobalConfigPage( i18n("External Tools"), EXTRATOOLSSETTINGS, info()->icon() );
- connect( m_configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )),
- this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) );
+ connect( m_configProxy, TQ_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )),
+ this, TQ_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) );
- connect(core(), TQT_SIGNAL(coreInitialized()), this, TQT_SLOT(updateMenu()));
+ connect(core(), TQ_SIGNAL(coreInitialized()), this, TQ_SLOT(updateMenu()));
- connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
- this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
+ connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)),
+ this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) );
// Apparently action lists can only be plugged after the
// xmlgui client has been registered
- TQTimer::singleShot(0, this, TQT_SLOT(updateToolsMenu()));
+ TQTimer::singleShot(0, this, TQ_SLOT(updateToolsMenu()));
}
@@ -73,14 +73,14 @@ void ToolsPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, un
if ( pagenumber == TOOLSSETTINGS )
{
ToolsConfig *w = new ToolsConfig( page, "tools config widget" );
- connect(dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()));
- connect(dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(updateMenu()));
+ connect(dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()));
+ connect(dlg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(updateMenu()));
}
else if ( pagenumber == EXTRATOOLSSETTINGS )
{
ToolsConfigWidget *w2 = new ToolsConfigWidget( page, "tools config widget" );
- connect(dlg, TQT_SIGNAL(okClicked()), w2, TQT_SLOT(accept()));
- connect(dlg, TQT_SIGNAL(destroyed()), this, TQT_SLOT(updateToolsMenu()));
+ connect(dlg, TQ_SIGNAL(okClicked()), w2, TQ_SLOT(accept()));
+ connect(dlg, TQ_SIGNAL(destroyed()), this, TQ_SLOT(updateToolsMenu()));
}
}
@@ -98,12 +98,12 @@ void ToolsPart::updateMenu()
{
TQString name = *it;
- KDesktopFile df(name, true);
+ TDEDesktopFile df(name, true);
if (df.readName().isNull())
continue;
TDEAction *action = new TDEAction(df.readName(), df.readIcon(), 0,
- this, TQT_SLOT(slotToolActivated()), (TQObject*)0, name.latin1());
+ this, TQ_SLOT(slotToolActivated()), (TQObject*)0, name.latin1());
actions.append(action);
}
@@ -113,8 +113,8 @@ void ToolsPart::updateMenu()
void ToolsPart::slotToolActivated()
{
- TQString df = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name();
- kapp->startServiceByDesktopPath(df);
+ TQString df = sender()->name();
+ tdeApp->startServiceByDesktopPath(df);
}
void ToolsPart::startCommand(TQString cmdline, bool captured, TQString fileName)
@@ -180,10 +180,10 @@ void ToolsPart::updateToolsMenu()
config->setGroup("Tool Menu " + menutext);
bool isdesktopfile = config->readBoolEntry("DesktopFile");
TDEAction *action = new TDEAction(*it, 0,
- this, TQT_SLOT(toolsMenuActivated()),
+ this, TQ_SLOT(toolsMenuActivated()),
(TQObject*) 0, menutext.utf8());
if (isdesktopfile) {
- KDesktopFile df(config->readPathEntry("CommandLine"));
+ TDEDesktopFile df(config->readPathEntry("CommandLine"));
action->setIcon(df.readIcon());
}
actions.append(action);
@@ -212,19 +212,19 @@ void ToolsPart::contextMenu(TQPopupMenu *popup, const Context *context)
TQStringList l = config->readListEntry("Dir Context");
TQStringList::ConstIterator it;
for (it = l.begin(); it != l.end(); ++it)
- externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQT_SLOT(dirContextActivated(int)) ), (*it) );
+ externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQ_SLOT(dirContextActivated(int)) ), (*it) );
} else {
TQStringList l = config->readListEntry("File Context");
TQStringList::ConstIterator it;
for (it = l.begin(); it != l.end(); ++it)
- externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQT_SLOT(fileContextActivated(int)) ), (*it) );
+ externalToolMenuEntries.insert( popup->insertItem( (*it), this, TQ_SLOT(fileContextActivated(int)) ), (*it) );
}
}
void ToolsPart::toolsMenuActivated()
{
- TQString menutext = TQT_TQOBJECT(const_cast<TQT_BASE_OBJECT_NAME*>(sender()))->name();
+ TQString menutext = sender()->name();
TDEConfig *config = ToolsFactory::instance()->config();
config->setGroup("Tool Menu " + menutext);
TQString cmdline = config->readPathEntry("CommandLine");
@@ -234,7 +234,7 @@ void ToolsPart::toolsMenuActivated()
<< "with cmdline " << cmdline
<< "and desktopfile " << isdesktopfile << endl;
if (isdesktopfile)
- kapp->startServiceByDesktopPath(cmdline);
+ tdeApp->startServiceByDesktopPath(cmdline);
else
startCommand(cmdline, captured, TQString());
}
diff --git a/parts/tools/tools_part.h b/parts/tools/tools_part.h
index 20af2ea8..8c87fd4f 100644
--- a/parts/tools/tools_part.h
+++ b/parts/tools/tools_part.h
@@ -22,7 +22,7 @@ class ToolsWidget;
class ToolsPart : public KDevPlugin
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/parts/tools/toolsconfig.cpp b/parts/tools/toolsconfig.cpp
index f21713e9..bedbd59f 100644
--- a/parts/tools/toolsconfig.cpp
+++ b/parts/tools/toolsconfig.cpp
@@ -8,7 +8,7 @@
#include <tqheader.h>
#include <tdeapplication.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
#include <kdialog.h>
#include <kiconloader.h>
#include <tdelocale.h>
@@ -50,13 +50,13 @@ void ToolsConfig::showEvent(TQShowEvent *e)
_toList->show();
vbox->addWidget(_toList);
- connect(_toList, TQT_SIGNAL(clicked()), this, TQT_SLOT(toList()));
+ connect(_toList, TQ_SIGNAL(clicked()), this, TQ_SLOT(toList()));
_toTree = new TQPushButton(TQApplication::reverseLayout() ? ">>" : "<<", this);
_toTree->show();
vbox->addWidget(_toTree);
- connect(_toTree, TQT_SIGNAL(clicked()), this, TQT_SLOT(toTree()));
+ connect(_toTree, TQ_SIGNAL(clicked()), this, TQ_SLOT(toTree()));
vbox = new TQVBoxLayout(hbox);
_list = new TQListBox(this);
@@ -72,8 +72,8 @@ void ToolsConfig::showEvent(TQShowEvent *e)
fill();
checkButtons();
- connect(_tree, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(checkButtons()));
- connect(_list, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(checkButtons()));
+ connect(_tree, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(checkButtons()));
+ connect(_list, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(checkButtons()));
}
@@ -100,7 +100,7 @@ void ToolsConfig::fill()
void ToolsConfig::add(const TQString &desktopFile)
{
- KDesktopFile df(desktopFile, true);
+ TDEDesktopFile df(desktopFile, true);
if (df.readName().isEmpty())
return;
diff --git a/parts/tools/toolsconfig.h b/parts/tools/toolsconfig.h
index 074d5900..2c1158fa 100644
--- a/parts/tools/toolsconfig.h
+++ b/parts/tools/toolsconfig.h
@@ -26,7 +26,7 @@ public:
class ToolsConfig : public TQWidget
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/parts/tools/toolsconfigwidget.cpp b/parts/tools/toolsconfigwidget.cpp
index 22d705c2..bfc9efbe 100644
--- a/parts/tools/toolsconfigwidget.cpp
+++ b/parts/tools/toolsconfigwidget.cpp
@@ -19,7 +19,7 @@
#include <tdeconfig.h>
#include <tdeversion.h>
#include <kdebug.h>
-#include <kdesktopfile.h>
+#include <tdedesktopfile.h>
#include <kiconloader.h>
#include <tdemessagebox.h>
#include <kurl.h>
@@ -113,7 +113,7 @@ void ToolsConfigWidget::fillListBox(TQListBox *lb, const TQDict<ToolsConfigEntry
for (; it.current(); ++it) {
ToolsConfigEntry *entry = it.current();
if (entry->isdesktopfile) {
- KDesktopFile df(entry->cmdline);
+ TDEDesktopFile df(entry->cmdline);
lb->insertItem(SmallIcon(df.readIcon()), entry->menutext);
} else {
lb->insertItem(entry->menutext);
@@ -259,8 +259,8 @@ bool ToolsConfigWidget::eventFilter(TQObject *o, TQEvent *e)
if (KURLDrag::decode(de, fileList)) {
KURL::List::ConstIterator it;
for (it = fileList.begin(); it != fileList.end(); ++it) {
- if ((*it).isLocalFile() && KDesktopFile::isDesktopFile((*it).path())) {
- KDesktopFile df((*it).path());
+ if ((*it).isLocalFile() && TDEDesktopFile::isDesktopFile((*it).path())) {
+ TDEDesktopFile df((*it).path());
ToolsConfigEntry *entry = new ToolsConfigEntry;
entry->menutext = df.readName();
entry->cmdline = (*it).path();
diff --git a/parts/tools/toolsconfigwidget.h b/parts/tools/toolsconfigwidget.h
index 99b2c95d..d8baa9c5 100644
--- a/parts/tools/toolsconfigwidget.h
+++ b/parts/tools/toolsconfigwidget.h
@@ -22,7 +22,7 @@ struct ToolsConfigEntry;
class ToolsConfigWidget : public ToolsConfigWidgetBase
{
- Q_OBJECT
+ TQ_OBJECT
public:
diff --git a/parts/tools/toolsconfigwidgetbase.ui b/parts/tools/toolsconfigwidgetbase.ui
index 67f9b7b5..4f9dfc4c 100644
--- a/parts/tools/toolsconfigwidgetbase.ui
+++ b/parts/tools/toolsconfigwidgetbase.ui
@@ -397,14 +397,14 @@
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
</includes>
-<Q_SLOTS>
+<slots>
<slot access="protected">dircontextaddClicked()</slot>
<slot access="protected">filecontextaddClicked()</slot>
<slot access="protected">filecontextremoveClicked()</slot>
<slot access="protected">dircontextremoveClicked()</slot>
<slot access="protected">toolsmenuaddClicked()</slot>
<slot access="protected">toolsmenuremoveClicked()</slot>
-</Q_SLOTS>
+</slots>
<layoutdefaults spacing="6" margin="11"/>
<layoutfunctions spacing="KDialog::spacingHint" margin="KDialog::marginHint"/>
</UI>