1 files changed, 3 insertions, 15 deletions
diff --git a/src/tools/uic/uic.h b/src/tools/uic/uic.h
index 1c229bc516..f3dfd49149 100644
--- a/src/tools/uic/uic.h
+++ b/src/tools/uic/uic.h
@@ -53,7 +53,7 @@ struct Option;
 
 class Uic
 {
-    Q_DISABLE_COPY(Uic)
+    Q_DISABLE_COPY_MOVE(Uic)
 public:
     Uic(Driver *driver);
     ~Uic();
@@ -83,33 +83,21 @@ public:
 
     bool write(QIODevice *in);
 
-#ifdef QT_UIC_JAVA_GENERATOR
-    bool jwrite(DomUI *ui);
-#endif
-
-#ifdef QT_UIC_CPP_GENERATOR
     bool write(DomUI *ui);
-#endif
 
-    bool isMainWindow(const QString &className) const;
-    bool isToolBar(const QString &className) const;
-    bool isStatusBar(const QString &className) const;
     bool isButton(const QString &className) const;
     bool isContainer(const QString &className) const;
-    bool isCustomWidgetContainer(const QString &className) const;
-    bool isMenuBar(const QString &className) const;
     bool isMenu(const QString &className) const;
 
 private:
     // copyright header
-    void writeCopyrightHeader(DomUI *ui);
+    void writeCopyrightHeaderCpp(const DomUI *ui) const;
+    void writeCopyrightHeaderPython(const DomUI *ui) const;
     DomUI *parseUiFile(QXmlStreamReader &reader);
 
-#ifdef QT_UIC_CPP_GENERATOR
     // header protection
     void writeHeaderProtectionStart();
     void writeHeaderProtectionEnd();
-#endif
 
 private:
     Driver *drv;