diff options
Diffstat (limited to 'kommander/widgets/popupmenu.cpp')
| -rw-r--r-- | kommander/widgets/popupmenu.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp index 48bb4474..e00ee485 100644 --- a/kommander/widgets/popupmenu.cpp +++ b/kommander/widgets/popupmenu.cpp @@ -32,8 +32,8 @@ #define INSERTSUBMENU 109 #define LAST_FUNCTION INSERTSUBMENU -PopupMenu::PopupMenu(TQWidget *parent, const char *name) - : TQLabel(parent, name), KommanderWidget(this) +PopupMenu::PopupMenu(TQWidget *tqparent, const char *name) + : TQLabel(tqparent, name), KommanderWidget(TQT_TQOBJECT(this)) { TQStringList states; states << "default"; @@ -114,7 +114,7 @@ void PopupMenu::popup(int x, int y) void PopupMenu::slotMenuItemActivated(int id) { TQString widget = m_associations[id]; - KommanderWidget::evalAssociatedText(TQString("#!kommander\n%1.execute(%2)").arg(widget).arg(id)); + KommanderWidget::evalAssociatedText(TQString("#!kommander\n%1.execute(%2)").tqarg(widget).tqarg(id)); } void PopupMenu::populate() @@ -138,7 +138,7 @@ TQString PopupMenu::insertSubmenu(const TQString& title, const TQString &menuWid bool PopupMenu::isFunctionSupported(int f) { - return f == DCOP::clear || f == DCOP::execute || f == DCOP::item || (f >= INSERTMENUITEM && f <= LAST_FUNCTION) || f == DCOP::count || f == DCOP::geometry; + return f == DCOP::clear || f == DCOP::execute || f == DCOP::item || (f >= INSERTMENUITEM && f <= LAST_FUNCTION) || f == DCOP::count || f == DCOP::tqgeometry; } TQString PopupMenu::handleDCOP(int function, const TQStringList& args) @@ -223,13 +223,13 @@ TQString PopupMenu::handleDCOP(int function, const TQStringList& args) case DCOP::item: { uint index = args[0].toInt(); - return index < m_params.count() ? m_params[index] : TQString::null; + return index < m_params.count() ? m_params[index] : TQString(); break; } case DCOP::count: return TQString::number(m_menu->count()); break; - case DCOP::geometry: + case DCOP::tqgeometry: { TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; |