summaryrefslogtreecommitdiffstats
path: root/src/libgui
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 15:05:21 -0600
committerTimothy Pearson <[email protected]>2013-02-01 15:05:21 -0600
commit6f617c4181afa90f3eba14139d4f92eb98834899 (patch)
tree8b1b3f1b1834eeca086e1b6948e926d726f3b025 /src/libgui
parentb42d04f596e5440b17d954ba9e24d55368030120 (diff)
downloadpiklab-6f617c4181afa90f3eba14139d4f92eb98834899.tar.gz
piklab-6f617c4181afa90f3eba14139d4f92eb98834899.zip
Rename a number of classes to enhance compatibility with KDE4
Diffstat (limited to 'src/libgui')
-rw-r--r--src/libgui/breakpoint_view.cpp4
-rw-r--r--src/libgui/breakpoint_view.h2
-rw-r--r--src/libgui/device_gui.cpp18
-rw-r--r--src/libgui/device_gui.h4
-rw-r--r--src/libgui/editor.h2
-rw-r--r--src/libgui/editor_manager.cpp6
-rw-r--r--src/libgui/gui_debug_manager.cpp2
-rw-r--r--src/libgui/gui_prog_manager.cpp2
-rw-r--r--src/libgui/hex_editor.cpp4
-rw-r--r--src/libgui/likeback.cpp2
-rw-r--r--src/libgui/main_global.cpp8
-rw-r--r--src/libgui/main_global.h4
-rw-r--r--src/libgui/project_manager.cpp6
-rw-r--r--src/libgui/project_manager_ui.cpp12
-rw-r--r--src/libgui/project_manager_ui.h14
-rw-r--r--src/libgui/project_wizard.cpp6
-rw-r--r--src/libgui/project_wizard.h4
-rw-r--r--src/libgui/toplevel.cpp122
-rw-r--r--src/libgui/toplevel_ui.cpp4
-rw-r--r--src/libgui/toplevel_ui.h2
-rw-r--r--src/libgui/watch_view.cpp6
-rw-r--r--src/libgui/watch_view.h4
22 files changed, 119 insertions, 119 deletions
diff --git a/src/libgui/breakpoint_view.cpp b/src/libgui/breakpoint_view.cpp
index 501fa98..0a1f081 100644
--- a/src/libgui/breakpoint_view.cpp
+++ b/src/libgui/breakpoint_view.cpp
@@ -30,7 +30,7 @@ void Breakpoint::updateActions(const Data *data)
//----------------------------------------------------------------------------
Breakpoint::ListViewItem::ListViewItem(ListView *parent, const Data &data)
- : KListViewItem(parent), _data(data)
+ : TDEListViewItem(parent), _data(data)
{}
//----------------------------------------------------------------------------
@@ -56,7 +56,7 @@ void Breakpoint::View::updateView()
_listview->clear();
for (uint i=0; i<Breakpoint::list().count(); i++) {
const Data &data = Breakpoint::list().data(i);
- KListViewItem *item = new ListViewItem(_listview, data);
+ TDEListViewItem *item = new ListViewItem(_listview, data);
item->setPixmap(0, TextEditor::pixmap(Debugger::manager->breakpointType(data)));
item->setText(1, data.url.filename() + ":" + TQString::number(data.line));
Address address = Breakpoint::list().address(data);
diff --git a/src/libgui/breakpoint_view.h b/src/libgui/breakpoint_view.h
index 9456182..697967b 100644
--- a/src/libgui/breakpoint_view.h
+++ b/src/libgui/breakpoint_view.h
@@ -15,7 +15,7 @@
namespace Breakpoint
{
//----------------------------------------------------------------------------
-class ListViewItem : public KListViewItem
+class ListViewItem : public TDEListViewItem
{
public:
ListViewItem(ListView *parent, const Data &data);
diff --git a/src/libgui/device_gui.cpp b/src/libgui/device_gui.cpp
index e5c6d4a..0ca3b32 100644
--- a/src/libgui/device_gui.cpp
+++ b/src/libgui/device_gui.cpp
@@ -50,15 +50,15 @@ const Tool::Group *DeviceChooser::Config::toolGroup()
}
//-----------------------------------------------------------------------------
-class ListItem : public KListViewItem
+class ListItem : public TDEListViewItem
{
public:
- ListItem(KListView *list, const TQString &name, bool selectable, bool isDevice)
- : KListViewItem(list, name), _device(isDevice) {
+ ListItem(TDEListView *list, const TQString &name, bool selectable, bool isDevice)
+ : TDEListViewItem(list, name), _device(isDevice) {
setSelectable(selectable);
}
- ListItem(KListViewItem *item, const TQString &name)
- : KListViewItem(item, name), _device(true) {}
+ ListItem(TDEListViewItem *item, const TQString &name)
+ : TDEListViewItem(item, name), _device(true) {}
bool isDevice() const { return _device; }
virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align) {
@@ -68,7 +68,7 @@ public:
Q_ASSERT(device);
ncg.setColor(TQColorGroup::Text, Device::statusColor(device->status()));
}
- KListViewItem::paintCell(p, ncg, column, width, align);
+ TDEListViewItem::paintCell(p, ncg, column, width, align);
}
private:
@@ -164,7 +164,7 @@ DeviceChooser::Dialog::Dialog(const TQString &device, Type type, TQWidget *paren
widths += 500;
Splitter *splitter = new Splitter(widths,Qt::Horizontal, mainWidget(), "device_shooser_splitter");
top->addWidget(splitter, 1);
- _listView = new KListView(splitter);
+ _listView = new TDEListView(splitter);
connect(_listView, TQT_SIGNAL(currentChanged(TQListViewItem *)),
TQT_SLOT(currentChanged(TQListViewItem *)));
connect(_listView, TQT_SIGNAL(doubleClicked(TQListViewItem *, const TQPoint &, int)),
@@ -256,7 +256,7 @@ const Tool::Group *DeviceChooser::Dialog::toolGroup() const
void DeviceChooser::Dialog::updateList(const TQString &device)
{
TQValueVector<TQString> list = Device::lister().supportedDevices();
- TQMap<TQString, KListViewItem *> groups;
+ TQMap<TQString, TDEListViewItem *> groups;
TQListViewItem *selected = 0;
const Programmer::Group *pgroup = programmerGroup();
if ( pgroup && pgroup->supportedDevices().isEmpty() && pgroup->isSoftware() ) {
@@ -279,7 +279,7 @@ void DeviceChooser::Dialog::updateList(const TQString &device)
if ( data->group().name()!="pic" ) continue;
if ( !static_cast<const Pic::Data *>(data)->hasFeature(_featureCombo->value()) ) continue;
}
- KListViewItem *item = 0;
+ TDEListViewItem *item = 0;
switch (_listTypeCombo->value().type()) {
case ListType::FamilyTree: {
TQString gname = data->listViewGroup();
diff --git a/src/libgui/device_gui.h b/src/libgui/device_gui.h
index bc69136..f015495 100644
--- a/src/libgui/device_gui.h
+++ b/src/libgui/device_gui.h
@@ -15,7 +15,7 @@
class TQListViewItem;
class TQCheckBox;
#include <ktextbrowser.h>
-class KListView;
+class TDEListView;
#include "common/gui/key_gui.h"
#include "common/gui/dialog.h"
@@ -107,7 +107,7 @@ private:
EnumComboBox<Device::MemoryTechnology> *_memoryCombo;
EnumComboBox<Device::Status> *_statusCombo;
EnumComboBox<Pic::Feature> *_featureCombo;
- KListView *_listView;
+ TDEListView *_listView;
View *_deviceView;
void updateList(const TQString &device);
diff --git a/src/libgui/editor.h b/src/libgui/editor.h
index 330c380..45e4cda 100644
--- a/src/libgui/editor.h
+++ b/src/libgui/editor.h
@@ -14,7 +14,7 @@
#include <tqvaluevector.h>
#include "common/common/qflags.h"
#include <kstdaction.h>
-class KPopupMenu;
+class TDEPopupMenu;
#include "common/global/purl.h"
diff --git a/src/libgui/editor_manager.cpp b/src/libgui/editor_manager.cpp
index 8713c9e..47bf16b 100644
--- a/src/libgui/editor_manager.cpp
+++ b/src/libgui/editor_manager.cpp
@@ -115,10 +115,10 @@ bool EditorManager::openFile(const PURL::Url &url)
return true;
}
if ( !openEditor(url) ) {
- static_cast< KRecentFilesAction *>(Main::action("file_open_recent"))->removeURL(url.kurl());
+ static_cast< TDERecentFilesAction *>(Main::action("file_open_recent"))->removeURL(url.kurl());
return false;
}
- static_cast<KRecentFilesAction *>(Main::action("file_open_recent"))->addURL(url.kurl());
+ static_cast<TDERecentFilesAction *>(Main::action("file_open_recent"))->addURL(url.kurl());
return true;
}
@@ -397,7 +397,7 @@ void EditorManager::contextMenu(int i, const TQPoint &p)
TQPixmap saveIcon = loader.loadIcon("filesave", KIcon::Small);
TQPixmap saveAsIcon = loader.loadIcon("filesaveas", KIcon::Small);
TQPixmap reloadIcon = loader.loadIcon("reload", KIcon::Small);
- KPopupMenu *popup = new KPopupMenu;
+ TDEPopupMenu *popup = new TDEPopupMenu;
popup->insertTitle(title(*editor));
popup->insertItem(closeIcon, i18n("Close"), 1);
if ( nbEditors()>1 ) popup->insertItem(i18n("Close All Others"), 2);
diff --git a/src/libgui/gui_debug_manager.cpp b/src/libgui/gui_debug_manager.cpp
index 9ddf0e0..365d37e 100644
--- a/src/libgui/gui_debug_manager.cpp
+++ b/src/libgui/gui_debug_manager.cpp
@@ -164,7 +164,7 @@ void Debugger::GuiManager::clear()
bool Debugger::GuiManager::update(bool gotoPC)
{
bool on = (programmer() ? programmer()->isTargetPowerOn() : false);
- static_cast<KToggleAction *>(Main::action("prog_power"))->setChecked(on);
+ static_cast<TDEToggleAction *>(Main::action("prog_power"))->setChecked(on);
return Manager::update(gotoPC);
}
diff --git a/src/libgui/gui_prog_manager.cpp b/src/libgui/gui_prog_manager.cpp
index ea22d7e..f76e6e7 100644
--- a/src/libgui/gui_prog_manager.cpp
+++ b/src/libgui/gui_prog_manager.cpp
@@ -44,7 +44,7 @@ bool Programmer::GuiManager::internalInitProgramming(bool debugging)
void Programmer::GuiManager::toggleDevicePower()
{
- bool on = static_cast<KToggleAction *>(Main::action("prog_power"))->isChecked();
+ bool on = static_cast<TDEToggleAction *>(Main::action("prog_power"))->isChecked();
setDevicePower(on);
}
diff --git a/src/libgui/hex_editor.cpp b/src/libgui/hex_editor.cpp
index 438996c..395ede5 100644
--- a/src/libgui/hex_editor.cpp
+++ b/src/libgui/hex_editor.cpp
@@ -36,13 +36,13 @@ HexEditorPart::HexEditorPart(HexEditor *editor)
(void)KStdAction::save(TQT_TQOBJECT(editor), TQT_SLOT(save()), actionCollection());
(void)KStdAction::saveAs(TQT_TQOBJECT(editor), TQT_SLOT(saveAs()), actionCollection());
- (void)new KToggleAction(i18n("Read Only Mode"), 0, 0, TQT_TQOBJECT(editor), TQT_SLOT(toggleReadOnly()), actionCollection(), "tools_toggle_write_lock");
+ (void)new TDEToggleAction(i18n("Read Only Mode"), 0, 0, TQT_TQOBJECT(editor), TQT_SLOT(toggleReadOnly()), actionCollection(), "tools_toggle_write_lock");
}
void HexEditorPart::setReadWrite(bool rw)
{
KParts::ReadWritePart::setReadWrite(rw);
- static_cast<KToggleAction *>(action("tools_toggle_write_lock"))->setChecked(!rw);
+ static_cast<TDEToggleAction *>(action("tools_toggle_write_lock"))->setChecked(!rw);
}
//-----------------------------------------------------------------------------
diff --git a/src/libgui/likeback.cpp b/src/libgui/likeback.cpp
index 0983080..27d0933 100644
--- a/src/libgui/likeback.cpp
+++ b/src/libgui/likeback.cpp
@@ -280,7 +280,7 @@ void LikeBack::autoMove()
// When a Kicker applet has the focus, like the Commandline TQLineEdit,
// the systemtray icon indicates to be the current window and the LikeBack is shown next to the system tray icon.
// It's obviously bad ;-) :
- bool shouldShow = false;//(enabled() && window && window->inherits("KMainWindow") );
+ bool shouldShow = false;//(enabled() && window && window->inherits("TDEMainWindow") );
if (shouldShow) {
//move(window->x() + window->width() - 100 - width(), window->y());
//move(window->x() + window->width() - 100 - width(), window->mapToGlobal(TQPoint(0, 0)).y() - height());
diff --git a/src/libgui/main_global.cpp b/src/libgui/main_global.cpp
index 283149d..b3e5a9e 100644
--- a/src/libgui/main_global.cpp
+++ b/src/libgui/main_global.cpp
@@ -51,13 +51,13 @@ Programmer::State Main::programmerState()
return (programmer() ? programmer()->state() : Programmer::NotConnected);
}
-KAction *Main::action(const char* name)
+TDEAction *Main::action(const char* name)
{
- return _toplevel->KMainWindow::action(name);
+ return _toplevel->TDEMainWindow::action(name);
}
-KAction *Main::action(KStdAction::StdAction action)
+TDEAction *Main::action(KStdAction::StdAction action)
{
- return _toplevel->KMainWindow::action(KStdAction::name(action));
+ return _toplevel->TDEMainWindow::action(KStdAction::name(action));
}
TQPopupMenu &Main::popup(const char *name)
diff --git a/src/libgui/main_global.h b/src/libgui/main_global.h
index a3dc901..9aa2768 100644
--- a/src/libgui/main_global.h
+++ b/src/libgui/main_global.h
@@ -39,8 +39,8 @@ public:
static const Programmer::Group &programmerGroup();
static Programmer::Base *programmer();
static Programmer::State programmerState();
- static KAction *action(const char *name);
- static KAction *action(KStdAction::StdAction action);
+ static TDEAction *action(const char *name);
+ static TDEAction *action(KStdAction::StdAction action);
static TQPopupMenu &popup(const char *name);
static EditorManager &editorManager() { return *_editorManager; }
static Editor *currentEditor();
diff --git a/src/libgui/project_manager.cpp b/src/libgui/project_manager.cpp
index c9eabc1..c568ebd 100644
--- a/src/libgui/project_manager.cpp
+++ b/src/libgui/project_manager.cpp
@@ -67,7 +67,7 @@ void ProjectManager::View::init()
clear();
_rootItem = new RootItem(this);
setCurrentItem(_rootItem);
- KListViewItem *item = new RegisterItem(headerItem(DeviceGroup));
+ TDEListViewItem *item = new RegisterItem(headerItem(DeviceGroup));
ensureItemVisible(item);
_deviceItem = new DeviceItem(headerItem(DeviceGroup));
ensureItemVisible(_deviceItem);
@@ -524,7 +524,7 @@ bool ProjectManager::View::openProject(const PURL::Url &url)
if ( url.isEmpty() ) return false;
bool reload = ( _project && _project->url()==url );
if ( reload && !MessageBox::askContinue(i18n("Project already loaded. Reload?"), i18n("Reload")) ) return false;
- static_cast< KRecentFilesAction *>(Main::action("project_open_recent"))->removeURL(url.kurl());
+ static_cast< TDERecentFilesAction *>(Main::action("project_open_recent"))->removeURL(url.kurl());
Project *p = new Project(url);
TQString error;
if ( !p->load(error) ) {
@@ -538,7 +538,7 @@ bool ProjectManager::View::openProject(const PURL::Url &url)
for(it=files.begin(); it!=files.end(); ++it) addFile(*it, (*it).fileType(), Intrinsic);
_projectData.type = PURL::Project;
_projectData.externals.clear();
- static_cast<KRecentFilesAction *>(Main::action("project_open_recent"))->addURL(url.kurl());
+ static_cast<TDERecentFilesAction *>(Main::action("project_open_recent"))->addURL(url.kurl());
files = _project->openedFiles();
for(it = files.begin(); it!=files.end(); ++it) Main::editorManager().openFile(*it);
Register::list().init();
diff --git a/src/libgui/project_manager_ui.cpp b/src/libgui/project_manager_ui.cpp
index 2d2bd15..2a230b9 100644
--- a/src/libgui/project_manager_ui.cpp
+++ b/src/libgui/project_manager_ui.cpp
@@ -23,8 +23,8 @@ void PopupMenu::insertItem(const TQString &icon, const TQString &label, TQObject
{
KIconLoader loader;
TQPixmap pixmap = loader.loadIcon(icon, KIcon::Small);
- if (receiver) KPopupMenu::insertItem(pixmap, label, receiver, slot, 0, _index);
- else KPopupMenu::insertItem(pixmap, label, _index);
+ if (receiver) TDEPopupMenu::insertItem(pixmap, label, receiver, slot, 0, _index);
+ else TDEPopupMenu::insertItem(pixmap, label, _index);
_index++;
}
@@ -47,7 +47,7 @@ ProjectManager::Group ProjectManager::group(PURL::FileType type)
return ViewGroup;
}
-ProjectManager::RootItem::RootItem(KListView *listview)
+ProjectManager::RootItem::RootItem(TDEListView *listview)
: UrlItem(listview)
{
setSelectable(false);
@@ -65,7 +65,7 @@ void ProjectManager::RootItem::set(const PURL::Url &url, bool standalone)
}
ProjectManager::HeaderItem::HeaderItem(RootItem *item, Group group)
- : KListViewItem(item), _group(group)
+ : TDEListViewItem(item), _group(group)
{
if ( group!=DeviceGroup) setSelectable(false);
setText(0, i18n(GROUP_LABELS[group]));
@@ -115,11 +115,11 @@ void ProjectManager::FileItem::paintCell(TQPainter *p, const TQColorGroup &cg,
TQFont f = p->font();
f.setItalic(group(_ftype)!=ViewGroup && _external);
p->setFont(f);
- KListViewItem::paintCell(p, cg, column, width, align);
+ TDEListViewItem::paintCell(p, cg, column, width, align);
}
ProjectManager::RegisterItem::RegisterItem(HeaderItem *item)
- : KListViewItem(item)
+ : TDEListViewItem(item)
{
KIconLoader loader;
TQPixmap chip = loader.loadIcon("piklab_chip", KIcon::Small);
diff --git a/src/libgui/project_manager_ui.h b/src/libgui/project_manager_ui.h
index bad071c..32852af 100644
--- a/src/libgui/project_manager_ui.h
+++ b/src/libgui/project_manager_ui.h
@@ -17,7 +17,7 @@
#include "common/gui/list_view.h"
//-----------------------------------------------------------------------------
-class PopupMenu : public KPopupMenu
+class PopupMenu : public TDEPopupMenu
{
Q_OBJECT
@@ -38,11 +38,11 @@ namespace ProjectManager
extern Group group(PURL::FileType type);
enum FileOrigin { Intrinsic, Generated, Included };
-class UrlItem : public KListViewItem
+class UrlItem : public TDEListViewItem
{
public:
- UrlItem(KListView *listview) : KListViewItem(listview) {}
- UrlItem(KListViewItem *item) : KListViewItem(item) {}
+ UrlItem(TDEListView *listview) : TDEListViewItem(listview) {}
+ UrlItem(TDEListViewItem *item) : TDEListViewItem(item) {}
virtual PURL::Url url() const { return _url; }
protected:
@@ -52,7 +52,7 @@ protected:
class RootItem : public UrlItem
{
public:
- RootItem(KListView *listview);
+ RootItem(TDEListView *listview);
void set(const PURL::Url &url, bool standAlone);
virtual int rtti() const { return RootRtti; }
@@ -60,7 +60,7 @@ private:
bool _standalone;
};
-class HeaderItem : public KListViewItem
+class HeaderItem : public TDEListViewItem
{
public:
HeaderItem(RootItem *item, Group group);
@@ -88,7 +88,7 @@ private:
virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int align);
};
-class RegisterItem : public KListViewItem
+class RegisterItem : public TDEListViewItem
{
public:
RegisterItem(HeaderItem *item);
diff --git a/src/libgui/project_wizard.cpp b/src/libgui/project_wizard.cpp
index 4bd5a51..292cf3b 100644
--- a/src/libgui/project_wizard.cpp
+++ b/src/libgui/project_wizard.cpp
@@ -26,8 +26,8 @@
#include "devices/list/device_list.h"
//-----------------------------------------------------------------------------
-FileListItem::FileListItem(KListView *view)
- : KListViewItem(view), _group(0), _copy(true)
+FileListItem::FileListItem(TDEListView *view)
+ : TDEListViewItem(view), _group(0), _copy(true)
{
KIconLoader loader;
_pixmap = loader.loadIcon("button_ok", KIcon::Small);
@@ -64,7 +64,7 @@ const TQPixmap *FileListItem::pixmap(int column) const
{
if ( column==0 && _copy ) return &_pixmap;
- return KListViewItem::pixmap(column);
+ return TDEListViewItem::pixmap(column);
}
//-----------------------------------------------------------------------------
diff --git a/src/libgui/project_wizard.h b/src/libgui/project_wizard.h
index abb3880..a5c4a13 100644
--- a/src/libgui/project_wizard.h
+++ b/src/libgui/project_wizard.h
@@ -24,10 +24,10 @@ namespace Tool { class Group; }
class Project;
//-----------------------------------------------------------------------------
-class FileListItem : public KListViewItem
+class FileListItem : public TDEListViewItem
{
public:
- FileListItem(KListView *view);
+ FileListItem(TDEListView *view);
void setToolGroup(const Tool::Group &group) { _group = &group; }
bool copy() const { return _copy; }
void toggle();
diff --git a/src/libgui/toplevel.cpp b/src/libgui/toplevel.cpp
index 55eac3f..61739e0 100644
--- a/src/libgui/toplevel.cpp
+++ b/src/libgui/toplevel.cpp
@@ -179,150 +179,150 @@ MainWindow::MainWindow()
// actions
// file actions
- KAction *a = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(newSourceFile()), actionCollection());
+ TDEAction *a = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(newSourceFile()), actionCollection());
a->setText(i18n("&New Source File..."));
- (void)new KAction(i18n("New hex File..."), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(newHexFile()),
+ (void)new TDEAction(i18n("New hex File..."), "filenew", 0, TQT_TQOBJECT(this), TQT_SLOT(newHexFile()),
actionCollection(), "file_new_hex");
KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(openFile()), actionCollection());
- KRecentFilesAction *recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openRecentFile(const KURL &)), actionCollection());
+ TDERecentFilesAction *recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openRecentFile(const KURL &)), actionCollection());
recent->setMaxItems(20);
recent->loadEntries(kapp->config(), "recent-files");
- (void)new KAction(i18n("Save All"), 0, 0, TQT_TQOBJECT(Main::_editorManager), TQT_SLOT(saveAllFiles()),
+ (void)new TDEAction(i18n("Save All"), 0, 0, TQT_TQOBJECT(Main::_editorManager), TQT_SLOT(saveAllFiles()),
actionCollection(), "file_save_all");
KStdAction::close(TQT_TQOBJECT(Main::_editorManager), TQT_SLOT(closeCurrentEditor()), actionCollection());
- (void)new KAction(i18n("C&lose All"), 0, 0, TQT_TQOBJECT(Main::_editorManager), TQT_SLOT(closeAllEditors()),
+ (void)new TDEAction(i18n("C&lose All"), 0, 0, TQT_TQOBJECT(Main::_editorManager), TQT_SLOT(closeAllEditors()),
actionCollection(), "file_close_all");
- (void)new KAction(i18n("Close All Others"), 0, 0, TQT_TQOBJECT(Main::_editorManager), TQT_SLOT(closeAllOtherEditors()),
+ (void)new TDEAction(i18n("Close All Others"), 0, 0, TQT_TQOBJECT(Main::_editorManager), TQT_SLOT(closeAllOtherEditors()),
actionCollection(), "file_closeother");
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
// edit actions
// view actions
- (void)new KAction(i18n("Back"), "back", TQt::ALT + TQt::Key_Left,
+ (void)new TDEAction(i18n("Back"), "back", TQt::ALT + TQt::Key_Left,
TQT_TQOBJECT(Main::_editorManager), TQT_SLOT(goBack()), actionCollection(), "history_back");
- (void)new KAction(i18n("Forward"), "forward", TQt::ALT + TQt::Key_Right,
+ (void)new TDEAction(i18n("Forward"), "forward", TQt::ALT + TQt::Key_Right,
TQT_TQOBJECT(Main::_editorManager), TQT_SLOT(goForward()), actionCollection(), "history_forward");
- (void)new KAction(i18n("Switch to..."), 0, TQt::CTRL + TQt::Key_Slash,
+ (void)new TDEAction(i18n("Switch to..."), 0, TQt::CTRL + TQt::Key_Slash,
TQT_TQOBJECT(Main::_editorManager), TQT_SLOT(switchToEditor()), actionCollection(), "file_switchto");
- (void)new KAction(i18n("Switch Header/Implementation"), 0, TQt::SHIFT + TQt::Key_F12,
+ (void)new TDEAction(i18n("Switch Header/Implementation"), 0, TQt::SHIFT + TQt::Key_F12,
TQT_TQOBJECT(Main::_editorManager), TQT_SLOT(switchHeaderImplementation()), actionCollection(), "view_switch_source");
- (void)new KAction(TQString(), 0, 0,
+ (void)new TDEAction(TQString(), 0, 0,
Debugger::manager, TQT_SLOT(toggleBreakpoint()), actionCollection(), "toggle_breakpoint");
- (void)new KAction(TQString(), 0, 0,
+ (void)new TDEAction(TQString(), 0, 0,
Debugger::manager, TQT_SLOT(toggleEnableBreakpoint()), actionCollection(), "enable_breakpoint");
- (void)new KAction(i18n("Show disassembly location"), 0, 0,
+ (void)new TDEAction(i18n("Show disassembly location"), 0, 0,
Debugger::manager, TQT_SLOT(showDisassemblyLocation()), actionCollection(), "show_disassembly_location");
- KActionMenu *toolViewsMenu = new KActionMenu( i18n("Tool Views"), 0, "view_tool_views");
+ TDEActionMenu *toolViewsMenu = new TDEActionMenu( i18n("Tool Views"), 0, "view_tool_views");
connect(toolViewsMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), TQT_SLOT(updateToolViewsActions()));
actionCollection()->insert(toolViewsMenu);
- a = new KAction(i18n("&Reset Layout"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(resetDockLayout()), actionCollection(), "view_reset_layout");
+ a = new TDEAction(i18n("&Reset Layout"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(resetDockLayout()), actionCollection(), "view_reset_layout");
toolViewsMenu->insert(a);
toolViewsMenu->popupMenu()->insertSeparator();
TQValueList<DockData>::iterator it;
for(it=_docks.begin(); it!=_docks.end(); ++it) toolViewsMenu->insert((*it).action);
// project actions
- (void)new KAction(i18n("New Project..."), "piklab_createproject", 0,
+ (void)new TDEAction(i18n("New Project..."), "piklab_createproject", 0,
TQT_TQOBJECT(this), TQT_SLOT(newProject()), actionCollection(), "project_new");
- (void)new KAction(i18n("Open Project..."), "piklab_openproject", 0,
+ (void)new TDEAction(i18n("Open Project..."), "piklab_openproject", 0,
TQT_TQOBJECT(this), TQT_SLOT(openProject()), actionCollection(), "project_open");
- recent = new KRecentFilesAction(i18n("Open Recent Project"), 0,
+ recent = new TDERecentFilesAction(i18n("Open Recent Project"), 0,
TQT_TQOBJECT(this), TQT_SLOT(openRecentProject(const KURL &)), actionCollection(), "project_open_recent");
recent->setMaxItems(20);
recent->loadEntries(kapp->config(), "recent-projects");
- (void)new KAction(i18n("Project Options..."), "configure", 0,
+ (void)new TDEAction(i18n("Project Options..."), "configure", 0,
TQT_TQOBJECT(this), TQT_SLOT(configureProject()), actionCollection(), "project_options");
- (void)new KAction(i18n("Close Project"), "fileclose", 0,
+ (void)new TDEAction(i18n("Close Project"), "fileclose", 0,
TQT_TQOBJECT(this), TQT_SLOT(closeProject()), actionCollection(), "project_close");
- (void)new KAction(i18n("Add Source File..."), "piklab_addfile", 0,
+ (void)new TDEAction(i18n("Add Source File..."), "piklab_addfile", 0,
TQT_TQOBJECT(Main::_projectManager), TQT_SLOT(insertSourceFiles()), actionCollection(), "project_add_source_file");
- (void)new KAction(i18n("Add Object File..."), "piklab_addfile", 0,
+ (void)new TDEAction(i18n("Add Object File..."), "piklab_addfile", 0,
TQT_TQOBJECT(Main::_projectManager), TQT_SLOT(insertObjectFiles()), actionCollection(), "project_add_object_file");
- (void)new KAction(i18n("Add Current File"), "piklab_addcurrentfile", 0,
+ (void)new TDEAction(i18n("Add Current File"), "piklab_addcurrentfile", 0,
TQT_TQOBJECT(Main::_projectManager), TQT_SLOT(insertCurrentFile()), actionCollection(), "project_add_current_file");
// build actions
- (void)new KAction(i18n("&Build Project"), "piklab_compile", TQt::Key_F8,
+ (void)new TDEAction(i18n("&Build Project"), "piklab_compile", TQt::Key_F8,
TQT_TQOBJECT(this), TQT_SLOT(buildProject()), actionCollection(), "build_build_project");
- (void)new KAction(i18n("&Compile File"), 0, TQt::SHIFT + TQt::Key_F8,
+ (void)new TDEAction(i18n("&Compile File"), 0, TQt::SHIFT + TQt::Key_F8,
TQT_TQOBJECT(this), TQT_SLOT(compileFile()), actionCollection(), "build_compile_file");
- (void)new KAction(i18n("Clean"), "trashcan_empty", 0,
+ (void)new TDEAction(i18n("Clean"), "trashcan_empty", 0,
TQT_TQOBJECT(this), TQT_SLOT(cleanBuild()), actionCollection(), "build_clean");
- (void)new KAction(i18n("Stop"), "stop", 0,
+ (void)new TDEAction(i18n("Stop"), "stop", 0,
TQT_TQOBJECT(this), TQT_SLOT(stopBuild()), actionCollection(), "build_stop");
// programmer actions
- (void)new KAction(i18n("&Connect"), "connect_creating", 0,
+ (void)new TDEAction(i18n("&Connect"), "connect_creating", 0,
Programmer::manager, TQT_SLOT(connectDevice()), actionCollection(), "prog_connect");
- (void)new KToggleAction(i18n("Device Power"), "piklab_power", 0,
+ (void)new TDEToggleAction(i18n("Device Power"), "piklab_power", 0,
Programmer::manager, TQT_SLOT(toggleDevicePower()), actionCollection(), "prog_power");
- (void)new KAction(i18n("&Disconnect"), "connect_no", 0,
+ (void)new TDEAction(i18n("&Disconnect"), "connect_no", 0,
Programmer::manager, TQT_SLOT(disconnectDevice()), actionCollection(), "prog_disconnect");
- (void)new KAction(i18n("&Program"), "piklab_burnchip", TQt::SHIFT + TQt::Key_F5,
+ (void)new TDEAction(i18n("&Program"), "piklab_burnchip", TQt::SHIFT + TQt::Key_F5,
TQT_TQOBJECT(this), TQT_SLOT(program()), actionCollection(), "prog_program");
- (void)new KAction(i18n("&Verify"), "piklab_verifychip", TQt::SHIFT + TQt::Key_F6,
+ (void)new TDEAction(i18n("&Verify"), "piklab_verifychip", TQt::SHIFT + TQt::Key_F6,
TQT_TQOBJECT(this), TQT_SLOT(verify()), actionCollection(), "prog_verify");
- (void)new KAction(i18n("&Read"), "piklab_readchip", TQt::SHIFT + TQt::Key_F7,
+ (void)new TDEAction(i18n("&Read"), "piklab_readchip", TQt::SHIFT + TQt::Key_F7,
TQT_TQOBJECT(this), TQT_SLOT(read()), actionCollection(), "prog_read");
- (void)new KAction(i18n("&Erase"), "piklab_erasechip", 0,
+ (void)new TDEAction(i18n("&Erase"), "piklab_erasechip", 0,
TQT_TQOBJECT(this), TQT_SLOT(erase()), actionCollection(), "prog_erase");
- (void)new KAction(i18n("&Blank Check"), "piklab_blankcheck", 0,
+ (void)new TDEAction(i18n("&Blank Check"), "piklab_blankcheck", 0,
TQT_TQOBJECT(this), TQT_SLOT(blankCheck()), actionCollection(), "prog_blank_check");
- (void)new KAction(i18n("&Run"), "launch", TQt::SHIFT + TQt::Key_F9,
+ (void)new TDEAction(i18n("&Run"), "launch", TQt::SHIFT + TQt::Key_F9,
Programmer::manager, TQT_SLOT(run()), actionCollection(), "prog_run");
- (void)new KAction(i18n("&Stop"), "piklab_stop", 0,
+ (void)new TDEAction(i18n("&Stop"), "piklab_stop", 0,
Programmer::manager, TQT_SLOT(halt()), actionCollection(), "prog_stop");
- (void)new KAction(i18n("R&estart"), "piklab_restart", 0,
+ (void)new TDEAction(i18n("R&estart"), "piklab_restart", 0,
Programmer::manager, TQT_SLOT(restart()), actionCollection(), "prog_restart");
- (void)new KAction(i18n("&Advanced..."), 0, 0,
+ (void)new TDEAction(i18n("&Advanced..."), 0, 0,
Programmer::manager , TQT_SLOT(showAdvancedDialog()), actionCollection(), "prog_advanced");
- (void)new KAction(i18n("Settings..."), "configure", 0,
+ (void)new TDEAction(i18n("Settings..."), "configure", 0,
TQT_TQOBJECT(this), TQT_SLOT(showProgrammerSettings()), actionCollection(), "prog_settings");
// debugger actions
- (void)new KAction(i18n("&Start"), "launch", TQt::SHIFT + TQt::Key_F9,
+ (void)new TDEAction(i18n("&Start"), "launch", TQt::SHIFT + TQt::Key_F9,
Programmer::manager, TQT_SLOT(restart()), actionCollection(), "debug_start");
- (void)new KAction(i18n("&Run"), "piklab_run", TQt::SHIFT + TQt::Key_F9,
+ (void)new TDEAction(i18n("&Run"), "piklab_run", TQt::SHIFT + TQt::Key_F9,
Programmer::manager, TQT_SLOT(run()), actionCollection(), "debug_run");
- (void)new KAction(i18n("&Step"), "piklab_debug_step", 0,
+ (void)new TDEAction(i18n("&Step"), "piklab_debug_step", 0,
Programmer::manager, TQT_SLOT(step()), actionCollection(), "debug_next");
- //(void)new KAction(i18n("Step &In"), "piklab_debug_stepin",
+ //(void)new TDEAction(i18n("Step &In"), "piklab_debug_stepin",
// 0, TQT_TQOBJECT(this), TQT_SLOT(debugStepIn()), actionCollection(), "debug_step_in");
- //(void)new KAction(i18n("Step &Out"), "piklab_debug_stepout",
+ //(void)new TDEAction(i18n("Step &Out"), "piklab_debug_stepout",
// 0, TQT_TQOBJECT(this), TQT_SLOT(debugStepOut()), actionCollection(), "debug_step_out");
- (void)new KAction(i18n("&Break<Translators: it is the verb>", "&Halt"), "piklab_debughalt", 0,
+ (void)new TDEAction(i18n("&Break<Translators: it is the verb>", "&Halt"), "piklab_debughalt", 0,
Programmer::manager, TQT_SLOT(halt()), actionCollection(), "debug_halt");
- (void)new KAction(i18n("&Disconnect/Stop"), "piklab_stop", 0,
+ (void)new TDEAction(i18n("&Disconnect/Stop"), "piklab_stop", 0,
Programmer::manager, TQT_SLOT(disconnectDevice()), actionCollection(), "debug_stop");
- (void)new KAction(i18n("R&eset"), "piklab_restart", 0,
+ (void)new TDEAction(i18n("R&eset"), "piklab_restart", 0,
Programmer::manager, TQT_SLOT(restart()), actionCollection(), "debug_reset");
- (void)new KAction(i18n("Show Program Counter"), "piklab_program_counter", 0,
+ (void)new TDEAction(i18n("Show Program Counter"), "piklab_program_counter", 0,
Debugger::manager, TQT_SLOT(showPC()), actionCollection(), "debug_show_pc");
- (void)new KAction(i18n("Clear All Breakpoints"), "remove", 0,
+ (void)new TDEAction(i18n("Clear All Breakpoints"), "remove", 0,
Debugger::manager, TQT_SLOT(clearBreakpoints()), actionCollection(), "debug_clear_breakpoints");
- (void)new KAction(i18n("Settings..."), "configure", 0,
+ (void)new TDEAction(i18n("Settings..."), "configure", 0,
TQT_TQOBJECT(this), TQT_SLOT(showDebuggerSettings()), actionCollection(), "debug_settings");
// tools
- (void)new KAction(i18n("&Pikloops..."), 0, 0,
+ (void)new TDEAction(i18n("&Pikloops..."), 0, 0,
TQT_TQOBJECT(this), TQT_SLOT(runPikloops()), actionCollection(), "tools_pikloops");
- (void)new KAction(i18n("&Find Files..."), "find", 0,
+ (void)new TDEAction(i18n("&Find Files..."), "find", 0,
TQT_TQOBJECT(this), TQT_SLOT(runKfind()), actionCollection(), "tools_kfind");
- (void)new KAction(i18n("&Device Information..."), "info", 0,
+ (void)new TDEAction(i18n("&Device Information..."), "info", 0,
TQT_TQOBJECT(this), TQT_SLOT(showDeviceInfo()), actionCollection(), "tools_device_information");
- (void)new KAction(i18n("&Config Generator..."), 0, 0,
+ (void)new TDEAction(i18n("&Config Generator..."), 0, 0,
TQT_TQOBJECT(this), TQT_SLOT(configGenerator()), actionCollection(), "tools_config_generator");
- (void)new KAction(i18n("&Template Generator..."), 0, 0,
+ (void)new TDEAction(i18n("&Template Generator..."), 0, 0,
TQT_TQOBJECT(this), TQT_SLOT(templateGenerator()), actionCollection(), "tools_template_generator");
// settings actions
- (void)new KAction(i18n("Configure Toolchains..."), 0, 0,
+ (void)new TDEAction(i18n("Configure Toolchains..."), 0, 0,
TQT_TQOBJECT(this), TQT_SLOT(configureToolchains()), actionCollection(), "options_configure_toolchains");
(void)KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configure()), actionCollection());
// help
- (void)new KAction(i18n("Report Bug..."), "likeback_bug", 0,
+ (void)new TDEAction(i18n("Report Bug..."), "likeback_bug", 0,
TQT_TQOBJECT(LikeBack::instance()), TQT_SLOT(iFoundABug()), actionCollection(), "help_report_bug_piklab");
setupGUI();
@@ -512,8 +512,8 @@ bool MainWindow::queryClose()
// save other settings
::PBusyCursor bc;
writeDockConfig(kapp->config(), "dock_config");
- static_cast<KRecentFilesAction *>(Main::action("project_open_recent"))->saveEntries(kapp->config(), "recent-projects");
- static_cast<KRecentFilesAction *>(Main::action("file_open_recent"))->saveEntries(kapp->config(), "recent-files");
+ static_cast<TDERecentFilesAction *>(Main::action("project_open_recent"))->saveEntries(kapp->config(), "recent-projects");
+ static_cast<TDERecentFilesAction *>(Main::action("file_open_recent"))->saveEntries(kapp->config(), "recent-files");
GlobalConfig::writeOpenedProject(Main::project() ? Main::project()->url() : PURL::Url());
if ( Main::project() ) Main::_projectManager->closeProject();
return true;
@@ -645,7 +645,7 @@ void MainWindow::updateGUI()
Main::action("prog_erase")->setEnabled(isProgrammer && idle);
Main::action("prog_blank_check")->setEnabled(isProgrammer && idle);
Programmer::State pstate = (Main::programmer() ? Main::programmer()->state() : Programmer::NotConnected);
- static_cast<KToggleAction *>(Main::action("prog_power"))->setEnabled(isProgrammer && idle && pstate!=Programmer::NotConnected);
+ static_cast<TDEToggleAction *>(Main::action("prog_power"))->setEnabled(isProgrammer && idle && pstate!=Programmer::NotConnected);
Main::action("prog_disconnect")->setEnabled(isProgrammer && idle && pstate!=Programmer::NotConnected);
bool isDebugger = ( Main::programmerGroup().properties() & ::Programmer::Debugger );
bool resetAvailable = ( Main::programmerGroup().properties() & Programmer::CanReleaseReset );
diff --git a/src/libgui/toplevel_ui.cpp b/src/libgui/toplevel_ui.cpp
index 2e33acb..c4ac7c0 100644
--- a/src/libgui/toplevel_ui.cpp
+++ b/src/libgui/toplevel_ui.cpp
@@ -51,12 +51,12 @@ void ToolStatusWidget::activatedSlot(int id)
//----------------------------------------------------------------------------
ViewMenuAction::ViewMenuAction(KDockWidget *widget)
- : KToggleAction(widget->tabPageLabel()), _widget(widget)
+ : TDEToggleAction(widget->tabPageLabel()), _widget(widget)
{}
void ViewMenuAction::slotActivated()
{
- KAction::slotActivated();
+ TDEAction::slotActivated();
emit activated(_widget);
}
diff --git a/src/libgui/toplevel_ui.h b/src/libgui/toplevel_ui.h
index 1f769e4..4ba1714 100644
--- a/src/libgui/toplevel_ui.h
+++ b/src/libgui/toplevel_ui.h
@@ -51,7 +51,7 @@ private slots:
};
//----------------------------------------------------------------------------
-class ViewMenuAction : public KToggleAction
+class ViewMenuAction : public TDEToggleAction
{
Q_OBJECT
diff --git a/src/libgui/watch_view.cpp b/src/libgui/watch_view.cpp
index 789b64a..097960d 100644
--- a/src/libgui/watch_view.cpp
+++ b/src/libgui/watch_view.cpp
@@ -91,11 +91,11 @@ Register::WatchedListView::WatchedListView(TQWidget *parent)
_root->setOpen(true);
}
-KPopupMenu *Register::WatchedListView::appendFormatMenu(KPopupMenu *parent, uint offset)
+TDEPopupMenu *Register::WatchedListView::appendFormatMenu(TDEPopupMenu *parent, uint offset)
{
KIconLoader loader;
TQPixmap icon = loader.loadIcon("fonts", KIcon::Small);
- KPopupMenu *popup = new KPopupMenu;
+ TDEPopupMenu *popup = new TDEPopupMenu;
popup->insertTitle(i18n("Format"));
FOR_EACH(NumberBase, base) popup->insertItem(base.label(), offset + base.type());
parent->insertItem(icon, i18n("Format"), popup);
@@ -176,7 +176,7 @@ void Register::WatchedListView::contextMenu(TQListViewItem *item, const TQPoint
} else {
if ( item->rtti()==Register::PortBitRtti ) return;
Register::ListViewItem *ritem = static_cast<ListViewItem *>(item);
- KPopupMenu *pop = new KPopupMenu;
+ TDEPopupMenu *pop = new TDEPopupMenu;
pop->insertTitle(ritem->label());
TQPopupMenu *fpop = appendFormatMenu(pop, 0);
FOR_EACH(NumberBase, base) fpop->setItemChecked(base.type(), ritem->base()==base);
diff --git a/src/libgui/watch_view.h b/src/libgui/watch_view.h
index 35a3d8d..6b6787b 100644
--- a/src/libgui/watch_view.h
+++ b/src/libgui/watch_view.h
@@ -69,10 +69,10 @@ private slots:
private:
PopupContainer *_popup;
- KPopupMenu *_formatPopup;
+ TDEPopupMenu *_formatPopup;
NumberBase _base;
- static KPopupMenu *appendFormatMenu(KPopupMenu *parent, uint offset);
+ static TDEPopupMenu *appendFormatMenu(TDEPopupMenu *parent, uint offset);
};
//-----------------------------------------------------------------------------