[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [pykde5] sip/kcoreaddons: kcoreaddons update.
From: Simon Edwards <simon () simonzone ! com>
Date: 2014-06-14 13:35:23
Message-ID: E1Wvo79-0001vn-5i () scm ! kde ! org
[Download RAW message or body]
Git commit d52bbcedd9cee3d12512395fd9f5d2f50364549b by Simon Edwards.
Committed on 14/06/2014 at 13:35.
Pushed by sedwards into branch 'master'.
kcoreaddons update.
M +29 -36 sip/kcoreaddons/kaboutdata.sip
M +6 -3 sip/kcoreaddons/kcoreaddonsmod.sip
C +7 -11 sip/kcoreaddons/kdelibs4migration.sip [from: sip/kcoreaddons/krandomsequence.sip - 061% \
similarity] C +0 -17 sip/kcoreaddons/kexportplugin.sip [from: sip/kcoreaddons/krandomsequence.sip - \
058% similarity] M +1 -1 sip/kcoreaddons/kformat.sip
M +1 -1 sip/kcoreaddons/kjob.sip
C +12 -11 sip/kcoreaddons/kpluginfactory.sip [from: sip/kcoreaddons/krandomsequence.sip - 056% \
similarity] A +64 -0 sip/kcoreaddons/kpluginloader.sip
M +3 -2 sip/kcoreaddons/kprocess.sip
M +1 -1 sip/kcoreaddons/krandomsequence.sip
M +79 -17 sip/kcoreaddons/kuser.sip
http://commits.kde.org/pykde5/d52bbcedd9cee3d12512395fd9f5d2f50364549b
diff --git a/sip/kcoreaddons/kaboutdata.sip b/sip/kcoreaddons/kaboutdata.sip
index 38485a7..7e3510a 100644
--- a/sip/kcoreaddons/kaboutdata.sip
+++ b/sip/kcoreaddons/kaboutdata.sip
@@ -17,11 +17,6 @@
// Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-//namespace KCrash
-//{
-//ig void defaultCrashHandler (int sig);
-//};
-
class KAboutPerson
{
%TypeHeaderCode
@@ -53,28 +48,6 @@ public:
static void setApplicationData (const KAboutData& aboutData);
static void registerPluginData (const KAboutData& aboutData);
static KAboutData* pluginData (const QString& componentName);
- enum LicenseKey
- {
- License_Custom,
- License_File,
- License_Unknown,
- License_GPL,
- License_GPL_V2,
- License_LGPL,
- License_LGPL_V2,
- License_BSD,
- License_Artistic,
- License_QPL,
- License_QPL_V1_0,
- License_GPL_V3,
- License_LGPL_V3
- };
- enum NameFormat
- {
- ShortName,
- FullName
- };
- KAboutData (const QString& componentName, const QString& catalogName, const \
QString& displayName, const QString& version, const QString& shortDescription = QString(), \
KAboutData::LicenseKey licenseType = KAboutData::LicenseKey::License_Unknown, const QString& \
copyrightStatement = QString(), const QString& otherText = QString(), const QString& homePageAddress = \
QString(), const QString& bugsEmailAddress = QLatin1String("submit@bugs.kde.org")); KAboutData (const \
KAboutData& other); ~KAboutData ();
KAboutData& addAuthor (const QString& name, const QString& task = QString(), const \
QString& emailAddress = QString(), const QString& webAddress = QString(), const QString& ocsUsername = \
QString()); @@ -91,9 +64,6 @@ public:
KAboutData& setOcsProvider (const QString& providerUrl);
KAboutData& setVersion (const QByteArray& version);
KAboutData& setShortDescription (const QString& shortDescription);
- KAboutData& setCatalogName (const QString& catalogName);
- KAboutData& setLicense (KAboutData::LicenseKey licenseKey);
- KAboutData& addLicense (KAboutData::LicenseKey licenseKey);
KAboutData& setCopyrightStatement (const QString& copyrightStatement);
KAboutData& setOtherText (const QString& otherText);
KAboutData& setHomepage (const QString& homepage);
@@ -111,7 +81,6 @@ public:
QString version () const;
const char* internalVersion () const;
QString shortDescription () const;
- QString catalogName () const;
QString homepage () const;
QString bugAddress () const;
const char* internalBugAddress () const;
@@ -120,8 +89,6 @@ public:
QList<KAboutPerson> translators () const;
static QString aboutTranslationTeam ();
QString otherText () const;
- QString license () const;
- QString licenseName (KAboutData::NameFormat formatName) const;
QList<KAboutLicense> licenses () const;
QString copyrightStatement () const;
QString customAuthorPlainText () const;
@@ -131,7 +98,11 @@ public:
KAboutData& unsetCustomAuthorText ();
//ig bool setupCommandLine (QCommandLineParser* parser);
//ig void processCommandLine (QCommandLineParser* parser);
+ KAboutData (const QString& componentName, const QString& displayName, const \
QString& version, const QString& shortDescription, KAboutLicense::LicenseKey licenseType, const QString& \
copyrightStatement = QString(), const QString& otherText = QString(), const QString& homePageAddress = \
QString(), const QString& bugsEmailAddress = QLatin1String("submit@bugs.kde.org")); + \
KAboutData (const QString& componentName, const QString& displayName, const QString& version); //ig \
KAboutData& operator= (const KAboutData& other); + KAboutData& setLicense \
(KAboutLicense::LicenseKey licenseKey); + KAboutData& addLicense \
(KAboutLicense::LicenseKey licenseKey); };
class KAboutLicense
{
@@ -143,12 +114,34 @@ public:
KAboutLicense (const KAboutLicense& other);
~KAboutLicense ();
QString text () const;
- QString name (KAboutData::NameFormat formatName) const;
- KAboutData::LicenseKey key () const;
+ KAboutLicense::LicenseKey key () const;
static KAboutLicense byKeyword (const QString& keyword);
private:
- explicit KAboutLicense (KAboutData::LicenseKey licenseType, const KAboutData* \
aboutData); explicit KAboutLicense (const KAboutData* aboutData);
public:
+ enum LicenseKey
+ {
+ Custom,
+ File,
+ Unknown,
+ GPL,
+ GPL_V2,
+ LGPL,
+ LGPL_V2,
+ BSDL,
+ Artistic,
+ QPL,
+ QPL_V1_0,
+ GPL_V3,
+ LGPL_V3
+ };
+ enum NameFormat
+ {
+ ShortName,
+ FullName
+ };
//ig KAboutLicense& operator= (const KAboutLicense& other);
+ QString name (KAboutLicense::NameFormat formatName) const;
+private:
+ explicit KAboutLicense (KAboutLicense::LicenseKey licenseType, const KAboutData* \
aboutData); };
diff --git a/sip/kcoreaddons/kcoreaddonsmod.sip b/sip/kcoreaddons/kcoreaddonsmod.sip
index 753c345..bffc3c4 100644
--- a/sip/kcoreaddons/kcoreaddonsmod.sip
+++ b/sip/kcoreaddons/kcoreaddonsmod.sip
@@ -26,19 +26,22 @@
%Import typedefs.sip
%Import QtCore/QtCoremod.sip
-%Include kfilesystemtype_p.sip
%Include kaboutdata.sip
%Include kautosavefile.sip
%Include kbackup.sip
%Include kcompositejob.sip
+%Include kdelibs4migration.sip
%Include kdirwatch.sip
-// FIXME doesn't compile, problem in the .h file.
-// %Include kformat.sip
+%Include kexportplugin.sip
+%Include kfilesystemtype_p.sip
+%Include kformat.sip
%Include kjob.sip
%Include kjobtrackerinterface.sip
%Include kjobuidelegate.sip
%Include kmacroexpander.sip
%Include kmessage.sip
+%Include kpluginfactory.sip
+%Include kpluginloader.sip
%Include kprocess.sip
%Include krandom.sip
%Include krandomsequence.sip
diff --git a/sip/kcoreaddons/krandomsequence.sip b/sip/kcoreaddons/kdelibs4migration.sip
similarity index 61%
copy from sip/kcoreaddons/krandomsequence.sip
copy to sip/kcoreaddons/kdelibs4migration.sip
index 37209a1..7dc70ba 100644
--- a/sip/kcoreaddons/krandomsequence.sip
+++ b/sip/kcoreaddons/kdelibs4migration.sip
@@ -17,20 +17,16 @@
// Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-class KRandomSequence
+class Kdelibs4Migration
{
%TypeHeaderCode
-#include <krandomsequence.h>
+#include <kdelibs4migration.h>
%End
public:
- explicit KRandomSequence (long lngSeed = 0);
- virtual ~KRandomSequence ();
- KRandomSequence (const KRandomSequence& a);
-//ig KRandomSequence& operator= (const KRandomSequence& a);
- void setSeed (long lngSeed = 0);
- double getDouble ();
- unsigned long getLong (unsigned long max);
- bool getBool ();
- void modulate (int i);
+ explicit Kdelibs4Migration ();
+ ~Kdelibs4Migration ();
+ bool kdeHomeFound () const;
+ QString locateLocal (const char* type, const QString& filename) const;
+ QString saveLocation (const char* type, const QString& suffix = QString()) const;
};
diff --git a/sip/kcoreaddons/krandomsequence.sip b/sip/kcoreaddons/kexportplugin.sip
similarity index 58%
copy from sip/kcoreaddons/krandomsequence.sip
copy to sip/kcoreaddons/kexportplugin.sip
index 37209a1..4904fb1 100644
--- a/sip/kcoreaddons/krandomsequence.sip
+++ b/sip/kcoreaddons/kexportplugin.sip
@@ -17,20 +17,3 @@
// Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-class KRandomSequence
-{
-%TypeHeaderCode
-#include <krandomsequence.h>
-%End
-
-public:
- explicit KRandomSequence (long lngSeed = 0);
- virtual ~KRandomSequence ();
- KRandomSequence (const KRandomSequence& a);
-//ig KRandomSequence& operator= (const KRandomSequence& a);
- void setSeed (long lngSeed = 0);
- double getDouble ();
- unsigned long getLong (unsigned long max);
- bool getBool ();
- void modulate (int i);
-};
diff --git a/sip/kcoreaddons/kformat.sip b/sip/kcoreaddons/kformat.sip
index 9d8e713..4bff711 100644
--- a/sip/kcoreaddons/kformat.sip
+++ b/sip/kcoreaddons/kformat.sip
@@ -17,7 +17,7 @@
// Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-class KFormat /NoDefaultCtors/
+class KFormat /Abstract/
{
%TypeHeaderCode
#include <kformat.h>
diff --git a/sip/kcoreaddons/kjob.sip b/sip/kcoreaddons/kjob.sip
index c8c3c31..a86e7bd 100644
--- a/sip/kcoreaddons/kjob.sip
+++ b/sip/kcoreaddons/kjob.sip
@@ -84,9 +84,9 @@ signals:
void suspended (KJob* job);
void resumed (KJob* job);
void result (KJob* job);
-//end
// FIXME
+//end
//ig void description (KJob* job, const QString& title, const \
QPair<QString,QString>& field1 = qMakePair(QString(),QString()), const QPair<QString,QString>& field2 = \
qMakePair(QString(),QString()));
void infoMessage (KJob* job, const QString& plain, const QString& rich = \
QString());
void warning (KJob* job, const QString& plain, const QString& rich = QString());
diff --git a/sip/kcoreaddons/krandomsequence.sip b/sip/kcoreaddons/kpluginfactory.sip
similarity index 56%
copy from sip/kcoreaddons/krandomsequence.sip
copy to sip/kcoreaddons/kpluginfactory.sip
index 37209a1..365935c 100644
--- a/sip/kcoreaddons/krandomsequence.sip
+++ b/sip/kcoreaddons/kpluginfactory.sip
@@ -17,20 +17,21 @@
// Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-class KRandomSequence
+class KPluginFactory : QObject
{
%TypeHeaderCode
-#include <krandomsequence.h>
+#include <kpluginfactory.h>
%End
public:
- explicit KRandomSequence (long lngSeed = 0);
- virtual ~KRandomSequence ();
- KRandomSequence (const KRandomSequence& a);
-//ig KRandomSequence& operator= (const KRandomSequence& a);
- void setSeed (long lngSeed = 0);
- double getDouble ();
- unsigned long getLong (unsigned long max);
- bool getBool ();
- void modulate (int i);
+ explicit KPluginFactory ();
+ virtual ~KPluginFactory ();
+ static QVariantList stringListToVariantList (const QStringList& list);
+ static QStringList variantListToStringList (const QVariantList& list);
+signals:
+ void objectCreated (QObject* object);
+protected:
+//ig explicit KPluginFactory (KPluginFactoryPrivate& dd);
+//ig virtual QObject* create (const char* iface, QWidget* parentWidget, QObject* parent, const \
QVariantList& args, const QString& keyword); };
+typedef KPluginFactory KLibFactory;
diff --git a/sip/kcoreaddons/kpluginloader.sip b/sip/kcoreaddons/kpluginloader.sip
new file mode 100644
index 0000000..c57d22d
--- /dev/null
+++ b/sip/kcoreaddons/kpluginloader.sip
@@ -0,0 +1,64 @@
+// Copyright 2014 Simon Edwards <simon@simonzone.com>
+
+// Generated by twine2
+
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU Library General Public License as
+// published by the Free Software Foundation; either version 2, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details
+
+// You should have received a copy of the GNU Library General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc.,
+// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+class KPluginLoader : QObject
+{
+%TypeHeaderCode
+#include <kpluginloader.h>
+%End
+
+public:
+ explicit KPluginLoader (const QString& plugin, QObject* parent = 0);
+ explicit KPluginLoader (const KPluginName& name, QObject* parent = 0);
+ ~KPluginLoader ();
+ KPluginFactory* factory ();
+ QString pluginName () const;
+ quint32 pluginVersion ();
+ static QString findPlugin (const QString& name);
+ QString errorString () const;
+ QString fileName () const;
+ QObject* instance ();
+ bool isLoaded () const;
+ bool load ();
+ QLibrary::LoadHints loadHints () const;
+//ig QJsonObject metaData () const;
+ void setLoadHints (QLibrary::LoadHints loadHints);
+ bool unload ();
+};
+class KPluginName
+{
+%TypeHeaderCode
+#include <kpluginloader.h>
+%End
+
+public:
+ explicit KPluginName (const QString& name);
+ QString name () const;
+ bool isValid () const;
+ QString errorString () const;
+ static KPluginName fromErrorString (const QString& errorString);
+private:
+ KPluginName (const QString& name, bool isError);
+};
+//ig KPluginName::KPluginName (const QString& name);
+//ig KPluginName::KPluginName (const QString& name, bool isError);
+//ig QString KPluginName::name () const;
+//ig bool KPluginName::isValid () const;
+//ig QString KPluginName::errorString () const;
+//ig KPluginName KPluginName::fromErrorString (const QString& errorString);
diff --git a/sip/kcoreaddons/kprocess.sip b/sip/kcoreaddons/kprocess.sip
index d9ec15d..f7b7fd3 100644
--- a/sip/kcoreaddons/kprocess.sip
+++ b/sip/kcoreaddons/kprocess.sip
@@ -42,8 +42,6 @@ public:
void clearEnvironment ();
void setProgram (const QString& exe, const QStringList& args = QStringList());
void setProgram (const QStringList& argv);
- KProcess& operator<< (const QString& arg);
- KProcess& operator<< (const QStringList& args);
void clearProgram ();
void setShellCommand (const QString& cmd);
QStringList program () const;
@@ -57,4 +55,7 @@ public:
int pid () const;
protected:
//ig KProcess (KProcessPrivate* d, QObject* parent);
+public:
+ KProcess& operator<< (const QString& arg);
+ KProcess& operator<< (const QStringList& args);
};
diff --git a/sip/kcoreaddons/krandomsequence.sip b/sip/kcoreaddons/krandomsequence.sip
index 37209a1..aa499db 100644
--- a/sip/kcoreaddons/krandomsequence.sip
+++ b/sip/kcoreaddons/krandomsequence.sip
@@ -27,10 +27,10 @@ public:
explicit KRandomSequence (long lngSeed = 0);
virtual ~KRandomSequence ();
KRandomSequence (const KRandomSequence& a);
-//ig KRandomSequence& operator= (const KRandomSequence& a);
void setSeed (long lngSeed = 0);
double getDouble ();
unsigned long getLong (unsigned long max);
bool getBool ();
void modulate (int i);
+//ig KRandomSequence& operator= (const KRandomSequence& a);
};
diff --git a/sip/kcoreaddons/kuser.sip b/sip/kcoreaddons/kuser.sip
index 430343b..9934d01 100644
--- a/sip/kcoreaddons/kuser.sip
+++ b/sip/kcoreaddons/kuser.sip
@@ -19,6 +19,57 @@
typedef uid_t K_UID;
typedef gid_t K_GID;
+
+//force
+struct KUserId
+{
+%TypeHeaderCode
+#include <kuser.h>
+%End
+ KUserId ();
+ explicit KUserId (K_UID uid);
+ KUserId (const KUserId& other);
+ ~KUserId ();
+public:
+ bool isValid () const;
+ K_UID nativeId () const;
+ QString toString () const;
+ bool operator== (const KUserId& other) const;
+ bool operator!= (const KUserId& other) const;
+%ConvertToSubClassCode
+ // CTSCC for subclasses of 'KUserId'
+ sipType = NULL;
+
+ if (dynamic_cast<KUserId*>(sipCpp))
+ sipType = sipType_KUserId;
+%End
+};
+
+struct KGroupId
+{
+%TypeHeaderCode
+#include <kuser.h>
+%End
+ KGroupId ();
+ explicit KGroupId (K_UID uid);
+ KGroupId (const KGroupId& other);
+ ~KGroupId ();
+public:
+ bool isValid () const;
+ K_GID nativeId () const;
+ QString toString () const;
+ bool operator== (const KGroupId& other) const;
+ bool operator!= (const KGroupId& other) const;
+%ConvertToSubClassCode
+ // CTSCC for subclasses of 'KGroupId'
+ sipType = NULL;
+
+ if (dynamic_cast<KGroupId*>(sipCpp))
+ sipType = sipType_KGroupId;
+%End
+};
+//end
+
class KUser
{
%TypeHeaderCode
@@ -37,19 +88,14 @@ public:
explicit KUser (const char* name);
//ig explicit KUser (const passwd* p);
KUser (const KUser& user);
-//ig KUser& operator= (const KUser& user);
- bool operator== (const KUser& user) const;
- bool operator!= (const KUser& user) const;
bool isValid () const;
- K_UID uid () const;
- K_GID gid () const;
bool isSuperUser () const;
QString loginName () const;
QString homeDir () const;
QString faceIconPath () const;
QString shell () const;
- QList<KUserGroup> groups () const;
- QStringList groupNames () const;
+ QList<KUserGroup> groups (uint maxCount = 0xffffffff) const;
+ QStringList groupNames (uint maxCount = 0xffffffff) const;
enum UserProperty
{
FullName,
@@ -59,9 +105,16 @@ public:
};
QVariant property (KUser::UserProperty which) const;
~KUser ();
- static QList<KUser> allUsers ();
- static QStringList allUserNames ();
+ static QList<KUser> allUsers (uint maxCount = 0xffffffff);
+ static QStringList allUserNames (uint maxCount = 0xffffffff);
+ explicit KUser (KUserId uid);
+ //ig KUser& operator= (const KUser& user);
+ bool operator== (const KUser& user) const;
+ bool operator!= (const KUser& user) const;
+ KUserId userId () const;
+ KGroupId groupId () const;
};
+
class KUserGroup
{
%TypeHeaderCode
@@ -75,15 +128,24 @@ public:
explicit KUserGroup (K_GID gid);
//ig explicit KUserGroup (const group* g);
KUserGroup (const KUserGroup& group);
-//ig KUserGroup& operator= (const KUserGroup& group);
- bool operator== (const KUserGroup& group) const;
- bool operator!= (const KUserGroup& group) const;
bool isValid () const;
- K_GID gid () const;
QString name () const;
- QList<KUser> users () const;
- QStringList userNames () const;
+ QList<KUser> users (uint maxCount = 0xffffffff) const;
+ QStringList userNames (uint maxCount = 0xffffffff) const;
~KUserGroup ();
- static QList<KUserGroup> allGroups ();
- static QStringList allGroupNames ();
+ static QList<KUserGroup> allGroups (uint maxCount = 0xffffffff);
+ static QStringList allGroupNames (uint maxCount = 0xffffffff);
+ explicit KUserGroup (KGroupId gid);
+//ig KUserGroup& operator= (const KUserGroup& group);
+ bool operator== (const KUserGroup& group) const;
+ bool operator!= (const KUserGroup& group) const;
+ KGroupId groupId () const;
};
+
+
+//bool KUser:: operator!= (const KUser& other) const;
+//bool KUserGroup:: operator!= (const KUserGroup& other) const;
+%ModuleHeaderCode
+//ctscc
+#include <kuser.h>
+%End
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic