Changeset 30205 in vbox

Timestamp:

Jun 15, 2010 3:39:05 PM (14 years ago)

Author:

vboxsync

Message:

FE/Qt4: Added another ctor. Removed unnecessary char* conversation.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionsPool.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionsPool.cpp

@@ -110 +110 @@
     {
         if (!strIcon.isNull())
-            setIcon(UIIconPool::iconSet(strIcon.toLatin1().data(),
-                                        strIconDis.toLatin1().data()));
+            setIcon(UIIconPool::iconSet(strIcon,
+                                        strIconDis));
+    }
+
+    UISimpleAction(QObject *pParent,
+                   const QIcon& icon)
+        : UIAction(pParent, UIActionType_Simple)
+    {
+        if (!icon.isNull())
+            setIcon(icon);
     }
 };
@@ -126 +134 @@
     {
         if (!strIcon.isNull())
-            setIcon(UIIconPool::iconSet(strIcon.toLatin1().data(),
-                                        strIconDis.toLatin1().data()));
+            setIcon(UIIconPool::iconSet(strIcon,
+                                        strIconDis));
         init();
     }
@@ -136 +144 @@
         : UIAction(pParent, UIActionType_Toggle)
     {
-        setIcon(UIIconPool::iconSetOnOff(strIconOn.toLatin1().data(), strIconOff.toLatin1().data(),
-                                         strIconOnDis.toLatin1().data(), strIconOffDis.toLatin1().data()));
+        setIcon(UIIconPool::iconSetOnOff(strIconOn, strIconOff,
+                                         strIconOnDis, strIconOffDis));
+        init();
+    }
+
+    UIToggleAction(QObject *pParent,
+                   const QIcon &icon)
+        : UIAction(pParent, UIActionType_Toggle)
+    {
+        if (!icon.isNull())
+            setIcon(icon);
         init();
     }
@@ -170 +187 @@
             setIcon(UIIconPool::iconSet(strIcon,
                                         strIconDis));
+        setMenu(new QIMenu);
+    }
+
+    UIMenuAction(QObject *pParent,
+                 const QIcon &icon)
+        : UIAction(pParent, UIActionType_Menu)
+    {
+        if (!icon.isNull())
+            setIcon(icon);
         setMenu(new QIMenu);
     }