restructuring; refs #167

src/designer/buttonlineeditwidgetifc.hxx

@@ -33,16 +33,17 @@ class ButtonLineEditWidgetIfc: public QObject,
       TRC;
       return
         QString
-        ("<ui language=\"c++\" displayname=\"%1\">"
-         "     <widget class=\"qbrowserlib::%1\" name=\"%2\"/>"
+        ("<ui language=\"c++\" displayname=\"%2\">"
+         "     <widget class=\"%1\" name=\"%3\"/>"
          "     <customwidgets>"
          "         <customwidget>"
-         "             <class>qbrowserlib::%1</class>"
+         "             <class>%1</class>"
          "         </customwidget>"
          "     </customwidgets>"
          "</ui>")
         .arg(name())
-        .arg(name().toLower());
+        .arg(className())
+        .arg(className().toLower());
     }
     QString group() const {
       TRC;
@@ -52,10 +53,18 @@ class ButtonLineEditWidgetIfc: public QObject,
       TRC;
       return "qbrowserlib/buttonlineedit.hxx";
     }
-    QString name() const {
+    QString namespaceName() const {
+      TRC;
+      return "qbrowserlib";
+    }
+    QString className() const {
       TRC;
       return "ButtonLineEdit";
     }
+    QString name() const {
+      TRC;
+      return QString("%1::%2").arg(namespaceName()).arg(className());
+    }
     QString toolTip() const {
       TRC;
       return "";
@@ -68,6 +77,10 @@ class ButtonLineEditWidgetIfc: public QObject,
       TRC;
       return new qbrowserlib::ButtonLineEdit(parent);
     }
+    bool isInitialized() {
+      TRC;
+      return true;
+    }
 };
 
 //! @}

src/designer/webviewwidgetifc.hxx

@@ -21,7 +21,7 @@ class SwissWebViewWidgetIfc: public QObject,
     Q_OBJECT;
     Q_INTERFACES(QDesignerCustomWidgetInterface);
   public:
-    SwissWebViewWidgetIfc(): _initialized(false) {}
+    SwissWebViewWidgetIfc() {}
     bool isContainer() const {
       TRC;
       return true;
@@ -34,29 +34,38 @@ class SwissWebViewWidgetIfc: public QObject,
       TRC;
       return
         QString
-        ("<ui language=\"c++\" displayname=\"%1\">"
-         "     <widget class=\"qbrowserlib::%1\" name=\"%2\"/>"
+        ("<ui language=\"c++\" displayname=\"%2\">"
+         "     <widget class=\"%1\" name=\"%3\"/>"
          "     <customwidgets>"
          "         <customwidget>"
-         "             <class>qbrowserlib::%1</class>"
+         "             <class>%1</class>"
          "         </customwidget>"
          "     </customwidgets>"
          "</ui>")
         .arg(name())
-        .arg(name().toLower());
+        .arg(className())
+        .arg(className().toLower());
     }
     QString group() const {
       TRC;
-      return "Display Widgets [Examples]";
+      return "Display Widgets";
     }
     QString includeFile() const {
       TRC;
       return "qbrowserlib/swisswebview.hxx";
     }
-    QString name() const {
+    QString namespaceName() const {
+      TRC;
+      return "qbrowserlib";
+    }
+    QString className() const {
       TRC;
       return "SwissWebView";
     }
+    QString name() const {
+      TRC;
+      return QString("%1::%2").arg(namespaceName()).arg(className());
+    }
     QString toolTip() const {
       TRC;
       return "";
@@ -71,14 +80,9 @@ class SwissWebViewWidgetIfc: public QObject,
     }
     bool isInitialized() {
       TRC;
-      return _initialized;
-    }
-    void initialized() {
-      TRC;
-      _initialized = true;
+      return true;
     }
   private:
-    bool _initialized;
     QNetworkAccessManager _net;
     qbrowserlib::Executor _executor;
 };