Reset submodule main/libraries/python-trinity/admin to latest HEAD

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "admin"]
+	path = admin
+	url = https://system@scm.trinitydesktop.org/scm/git/tde-common-admin

admin

@@ -0,0 +1 @@
+Subproject commit 92a6d62b8f8f1836c43b54e3fb13b7ea7bb22e9f

configure.py

@@ -513,7 +513,7 @@ def check_distribution ():
     
     for file in dist:
         if file.find ("andrake") > 0:
-            kde_sip_flags.remove ("ALL")
+            kde_sip_flags.pop()
             kde_sip_flags.append ("D_MANDRAKE")
 
 def set_sip_flags():
@@ -786,7 +786,7 @@ def create_makefiles():
     sipconfig.ParentMakefile(
         configuration = pyqtcfg,
         subdirs = subdirs,
-        installs= [("pykdeconfig.py", opt_pykdemoddir), (srcPath("contrib/kdepyuic"), sipcfg.default_bin_dir)]
+        installs= [("pykdeconfig.py", opt_pykdemoddir), (srcPath("contrib/kdepyuic"), opt_kdebasedir + "/bin")]
     ).generate()
 
 

sip/kdecore/kaccel.sip

@@ -35,7 +35,7 @@ public:
                          KAccel (QWidget* /TransferThis/, const char* = 0);
                          KAccel (QWidget*, QObject* /TransferThis/, const char* = 0);
     KAccelActions&       actions ();
-    bool                 isEnabled () const;
+    bool                 isEnabled ();
     void                 setEnabled (bool);
     bool                 setAutoUpdate (bool);
 

sip/kdecore/kaccelbase.sip

@@ -48,7 +48,7 @@ public:
                          KAccelBase (int);
     uint                 actionCount () const;
     KAccelActions&       actions ();
-    bool                 isEnabled () const;
+    bool                 isEnabled ();
     KAccelAction*        actionPtr (const QString&);
     KAccelAction*        actionPtr (const KKey&);
     KAccelAction*        actionPtr (const KKeyServer::Key&);

sip/kdecore/kglobalaccel.sip

@@ -33,7 +33,7 @@ class KGlobalAccel : QObject
 
 public:
                          KGlobalAccel (QObject*, const char* = 0);
-    bool                 isEnabled () const;
+    bool                 isEnabled ();
     void                 setEnabled (bool);
     KAccelAction*        insert (const QString&, const QString&, const QString&, const KShortcut&, const KShortcut&, SIP_RXOBJ_CON, SIP_SLOT_CON (), bool = 1, bool = 1);
 

sip/kdeui/keditlistbox.sip

@@ -114,7 +114,7 @@ public:
     sipCpp->insertStrList (strings, n, a1);
     Py_END_ALLOW_THREADS
 
-    sipFree((ANY *)strings);
+    sipFree((void *)strings);
 %End
 
     void                 insertItem (const QString&, int = -1);
@@ -194,7 +194,7 @@ const char **PyQtListToArray(PyObject *lst)
 
 		if ((s = PyString_AsString(PyList_GetItem(lst,i))) == NULL)
 		{
-			sipFree((ANY *)str);
+			sipFree((void *)str);
 			return NULL;
 		}
 

sip/kdeui/qxembed.sip

@@ -72,7 +72,7 @@ public:
     sipRes = QXEmbed::processClientCmdline (a0, n, strings);
     Py_END_ALLOW_THREADS
 
-    sipFree((ANY *)strings);
+    sipFree((void *)strings);
 %End