From 7af884d886e2428d5b28e9cf7d81c97d7e378123 Mon Sep 17 00:00:00 2001
From: samelian <samelian@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sun, 16 Jan 2011 14:35:51 +0000
Subject: [kdewebdev/quanta] fix deprecation warnings; make compatible with
 QT_NO_ASCII_CAST flag

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1214823 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 quanta/dialogs/actionconfigdialog.cpp | 4 ++--
 quanta/dialogs/actionconfigdialog.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'quanta/dialogs')

diff --git a/quanta/dialogs/actionconfigdialog.cpp b/quanta/dialogs/actionconfigdialog.cpp
index a66f7499..de63fc3e 100644
--- a/quanta/dialogs/actionconfigdialog.cpp
+++ b/quanta/dialogs/actionconfigdialog.cpp
@@ -103,7 +103,7 @@ ActionConfigDialog::ActionConfigDialog(const TQDict<ToolbarEntry> &toolbarList,
       {
         if (node.nodeName() == "Action")
         {
-          action = ac->action(node.toElement().attribute("name"));
+          action = ac->action(node.toElement().attribute("name").ascii());
           if (action)
           {
             oldActionItem = new KListViewItem(item, oldActionItem, action->text().replace(r,""), action->shortcut().toString(), action->name());
@@ -240,7 +240,7 @@ void ActionConfigDialog::slotEditToolbar()
         {
           if (node.nodeName() == "Action")
           {
-            action = ac->action(node.toElement().attribute("name"));
+            action = ac->action(node.toElement().attribute("name").ascii());
             if (action)
             {
               oldItem = new KListViewItem(item, oldItem, action->text().replace(TQRegExp("\\&(?!\\&)"),""), action->shortcut().toString(), action->name());
diff --git a/quanta/dialogs/actionconfigdialog.h b/quanta/dialogs/actionconfigdialog.h
index 6eaa9746..d0bee34e 100644
--- a/quanta/dialogs/actionconfigdialog.h
+++ b/quanta/dialogs/actionconfigdialog.h
@@ -27,7 +27,7 @@ class KPopupMenu;
 class KShortcut;
 class KXMLGUIClient;
 
-typedef struct ToolbarEntry{
+struct ToolbarEntry {
   KXMLGUIClient *guiClient;
   TQDomDocument *dom;
   TQPopupMenu *menu;
-- 
cgit v1.2.1