summaryrefslogtreecommitdiffstats
path: root/quanta/utility
diff options
context:
space:
mode:
Diffstat (limited to 'quanta/utility')
-rw-r--r--quanta/utility/qpevents.cpp2
-rw-r--r--quanta/utility/quantacommon.h2
-rw-r--r--quanta/utility/tagaction.cpp2
-rw-r--r--quanta/utility/tagactionset.cpp4
4 files changed, 5 insertions, 5 deletions
diff --git a/quanta/utility/qpevents.cpp b/quanta/utility/qpevents.cpp
index 7bad8715..3426b83f 100644
--- a/quanta/utility/qpevents.cpp
+++ b/quanta/utility/qpevents.cpp
@@ -321,7 +321,7 @@ bool QPEvents::handleEvent(const EventAction& ev)
if (ev.action == "script" || ev.action =="action")
{
TQString name = ev.arguments[0];
- KAction *action = quantaApp->actionCollection()->action(name);
+ KAction *action = quantaApp->actionCollection()->action(name.ascii());
TagAction *tagAction = dynamic_cast<TagAction*>(action);
if (tagAction)
{
diff --git a/quanta/utility/quantacommon.h b/quanta/utility/quantacommon.h
index ac209570..915de6fb 100644
--- a/quanta/utility/quantacommon.h
+++ b/quanta/utility/quantacommon.h
@@ -104,7 +104,7 @@ public:
bool smartTagInsertion; //enable/disable smartTagInsertion
};
-typedef struct DirInfo{
+struct DirInfo {
TQString mimeType;
TQString preText;
TQString postText;
diff --git a/quanta/utility/tagaction.cpp b/quanta/utility/tagaction.cpp
index 28d37450..9787d047 100644
--- a/quanta/utility/tagaction.cpp
+++ b/quanta/utility/tagaction.cpp
@@ -74,7 +74,7 @@ int MyProcess::commSetupDoneC()
TagAction::TagAction( TQDomElement *element, KMainWindow *parentMainWindow, bool toggle)
: KToggleAction(element->attribute("text").isEmpty() ? TQString("") : i18n(element->attribute("text").utf8()),
- KShortcut(element->attribute("shortcut")), 0, 0, parentMainWindow->actionCollection(), element->attribute("name")),
+ KShortcut(element->attribute("shortcut")), 0, 0, parentMainWindow->actionCollection(), element->attribute("name").ascii()),
//disable toggle now m_toggle(toggle)
m_toggle(false)
{
diff --git a/quanta/utility/tagactionset.cpp b/quanta/utility/tagactionset.cpp
index a74df537..28f01ef8 100644
--- a/quanta/utility/tagactionset.cpp
+++ b/quanta/utility/tagactionset.cpp
@@ -100,7 +100,7 @@ void TagActionSet::initActions(TQWidget* /*parent*/)
{
KActionCollection* ac(TagActionManager::self()->actionCollection());
- TQString actionName = "apply_source_indentation";
+ const char *actionName = "apply_source_indentation";
new KAction(i18n("Apply Source Indentation"), 0, this,
TQT_SLOT(slotApplySourceIndentation()),
ac, actionName);
@@ -296,7 +296,7 @@ void TableTagActionSet::initActions(TQWidget* parent)
// Insert___________________________________________________________________________
- TQString actionName = "insert_table";
+ const char *actionName = "insert_table";
//m_actionNames += actionName;
new KAction(i18n("Table..."), 0, this,
TQT_SLOT(slotInsertTable()),