diff options
93 files changed, 1465 insertions, 2069 deletions
@@ -1,161 +1,338 @@ ------------------------------------------------------------------------ -r124 | (jim) | 2006-01-21 11:33:36 -0800 (Sat, 21 Jan 2006) | 2 lines +r160 | (no author) | 2006-09-22 00:23:44 -0700 (Fri, 22 Sep 2006) | 2 lines + +tdeio/tdefileshare changed in error - reverted + +------------------------------------------------------------------------ +r159 | (no author) | 2006-09-22 00:22:47 -0700 (Fri, 22 Sep 2006) | 3 lines + +Bumped min versions: sip >= 4.4.0, PyTQt >= 3.16.0, +TQt >= 3.2.0 + +------------------------------------------------------------------------ +r158 | (no author) | 2006-09-22 00:16:56 -0700 (Fri, 22 Sep 2006) | 3 lines + +version error KMimeType::List; changed -x to -t for +%Platforms in configure.py, added "ALL" generic platform + +------------------------------------------------------------------------ +r157 | (no author) | 2006-09-21 23:19:39 -0700 (Thu, 21 Sep 2006) | 3 lines + +configure.py searches for lib64; non-functional PyKDE +version methods deleted (and in docs) + +------------------------------------------------------------------------ +r156 | (no author) | 2006-09-21 17:56:59 -0700 (Thu, 21 Sep 2006) | 2 lines + +update sip.in and diff files for tdeparts.konsole_part + +------------------------------------------------------------------------ +r155 | (no author) | 2006-09-21 17:54:25 -0700 (Thu, 21 Sep 2006) | 2 lines + +set konsolepart for KDE3.5.0 or greater only + +------------------------------------------------------------------------ +r154 | (no author) | 2006-09-21 14:12:29 -0700 (Thu, 21 Sep 2006) | 2 lines + +remove pyc files from svn + +------------------------------------------------------------------------ +r153 | (no author) | 2006-09-21 14:11:58 -0700 (Thu, 21 Sep 2006) | 2 lines + +konsole_part stuff + +------------------------------------------------------------------------ +r152 | (no author) | 2006-09-21 10:13:58 -0700 (Thu, 21 Sep 2006) | 3 lines + +added konsole_part.h to versions missing it; added +extra/kde353 to base fileset + +------------------------------------------------------------------------ +r150 | (no author) | 2006-09-21 08:38:43 -0700 (Thu, 21 Sep 2006) | 3 lines + +More cleanup for 3.16 release; added konsole_part again; +miscellaneous small bug fixes + +------------------------------------------------------------------------ +r149 | (no author) | 2006-09-19 16:26:43 -0700 (Tue, 19 Sep 2006) | 2 lines + +Upgrade to KDE 3.5.3 + +------------------------------------------------------------------------ +r148 | (no author) | 2006-09-19 16:24:33 -0700 (Tue, 19 Sep 2006) | 3 lines + +Cleaned up files for presip; minor fixes for 9/17 sip snapshot +Clean fileset - presip will build clean 3.5.3 from this set + +------------------------------------------------------------------------ +r145 | (no author) | 2006-05-26 21:49:46 -0700 (Fri, 26 May 2006) | 2 lines + +Deleted commented out TQList code + +------------------------------------------------------------------------ +r144 | (no author) | 2006-05-26 20:39:51 -0700 (Fri, 26 May 2006) | 2 lines + +Eliminate obsolete TQList/qlist.h references + +------------------------------------------------------------------------ +r143 | (no author) | 2006-05-25 01:54:27 -0700 (Thu, 25 May 2006) | 2 lines + +fix for KDE 3.1.x + +------------------------------------------------------------------------ +r142 | (no author) | 2006-05-22 19:26:54 -0700 (Mon, 22 May 2006) | 3 lines + +fixes for KDE < 3.2.0 in configure.py, tdeabc .diff files +and knotifydialog + +------------------------------------------------------------------------ +r141 | (no author) | 2006-05-22 00:38:44 -0700 (Mon, 22 May 2006) | 2 lines + +remove top-level (*mod.sip) files + +------------------------------------------------------------------------ +r140 | (no author) | 2006-05-21 20:27:45 -0700 (Sun, 21 May 2006) | 2 lines + +added extra/kde352 + +------------------------------------------------------------------------ +r139 | (no author) | 2006-05-21 20:06:53 -0700 (Sun, 21 May 2006) | 2 lines + +KDE 3.3.0 touchup + +------------------------------------------------------------------------ +r138 | (no author) | 2006-05-21 18:24:47 -0700 (Sun, 21 May 2006) | 2 lines + +clean up .sip.in files + +------------------------------------------------------------------------ +r137 | (no author) | 2006-05-21 15:46:13 -0700 (Sun, 21 May 2006) | 2 lines + +modifications for KDE 3.3.0 compatibility + +------------------------------------------------------------------------ +r136 | (no author) | 2006-05-21 04:59:30 -0700 (Sun, 21 May 2006) | 2 lines + +KDE 3.5.2 + +------------------------------------------------------------------------ +r135 | (no author) | 2006-05-20 15:27:11 -0700 (Sat, 20 May 2006) | 2 lines + +added 352 project file + +------------------------------------------------------------------------ +r133 | (no author) | 2006-05-19 00:53:46 -0700 (Fri, 19 May 2006) | 2 lines + +KDE 3.5.1 + +------------------------------------------------------------------------ +r132 | (no author) | 2006-01-27 13:00:18 -0800 (Fri, 27 Jan 2006) | 2 lines + +added missing method tdeabc/resourcefile.sip + +------------------------------------------------------------------------ +r131 | (no author) | 2006-01-26 19:27:45 -0800 (Thu, 26 Jan 2006) | 2 lines + +fully-qualified names in tdeabc/resourcefile.sip + +------------------------------------------------------------------------ +r130 | (no author) | 2006-01-26 16:53:44 -0800 (Thu, 26 Jan 2006) | 3 lines + +Put tdeabc/resourcefile.sip back into tdeabc for later +versions (missing in tdelibs tarball, but in trinity/include/tdeabc) + +------------------------------------------------------------------------ +r129 | (no author) | 2006-01-26 16:50:00 -0800 (Thu, 26 Jan 2006) | 3 lines + +Removed *mod.sip files from version control (user +generated) + +------------------------------------------------------------------------ +r128 | (no author) | 2006-01-26 16:46:27 -0800 (Thu, 26 Jan 2006) | 2 lines + +Updated tdeabc/resourcefile.sip - versioning + +------------------------------------------------------------------------ +r127 | (no author) | 2006-01-23 00:19:15 -0800 (Mon, 23 Jan 2006) | 2 lines + +typo in configure.py + +------------------------------------------------------------------------ +r126 | (no author) | 2006-01-22 23:08:28 -0800 (Sun, 22 Jan 2006) | 4 lines + +changed configure.py to concatenate by default for +gcc >= 4.0.3; deleted unneeded mapped type from +tdeio/global.sip + +------------------------------------------------------------------------ +r125 | (no author) | 2006-01-22 21:45:55 -0800 (Sun, 22 Jan 2006) | 8 lines + +modify configure.py to drop tderesources for KDE < 3.2; +version Resource class in tdeabc/resource.sip; version +64 bit read/write stuff in tdecore/tdeconfigbase.sip; +version copy ctor in tdecore/kprocctrl.sip; version +out longlong/ulonglong mapped types in tdeio/global.sip; +version one method in tdeio/tdesycoca.sip; fix line with +illegal char (?) in extensions/dcopexport.py + +------------------------------------------------------------------------ +r124 | (no author) | 2006-01-21 11:33:36 -0800 (Sat, 21 Jan 2006) | 2 lines removed kkeyserver.sip references from all .diff files ------------------------------------------------------------------------ -r123 | (jim) | 2006-01-21 11:31:03 -0800 (Sat, 21 Jan 2006) | 2 lines +r123 | (no author) | 2006-01-21 11:31:03 -0800 (Sat, 21 Jan 2006) | 2 lines updated docs ------------------------------------------------------------------------ -r122 | (jim) | 2006-01-21 10:46:51 -0800 (Sat, 21 Jan 2006) | 2 lines +r122 | (no author) | 2006-01-21 10:46:51 -0800 (Sat, 21 Jan 2006) | 2 lines fixed TOC links in classref doc files ------------------------------------------------------------------------ -r121 | (jim) | 2006-01-21 01:20:30 -0800 (Sat, 21 Jan 2006) | 2 lines +r121 | (no author) | 2006-01-21 01:20:30 -0800 (Sat, 21 Jan 2006) | 2 lines Initial doc update ------------------------------------------------------------------------ -r120 | (jim) | 2006-01-20 17:37:06 -0800 (Fri, 20 Jan 2006) | 3 lines +r120 | (no author) | 2006-01-20 17:37:06 -0800 (Fri, 20 Jan 2006) | 3 lines fixed TQValueList<TDEConfigSkeleton::ItemEnum::Choice> code and fixed dcopexport.py handling of void return types ------------------------------------------------------------------------ -r119 | (jim) | 2006-01-20 12:14:10 -0800 (Fri, 20 Jan 2006) | 2 lines +r119 | (no author) | 2006-01-20 12:14:10 -0800 (Fri, 20 Jan 2006) | 2 lines added X11 include ------------------------------------------------------------------------ -r118 | (jim) | 2006-01-18 23:27:15 -0800 (Wed, 18 Jan 2006) | 2 lines +r118 | (no author) | 2006-01-18 23:27:15 -0800 (Wed, 18 Jan 2006) | 2 lines backed out ambiguous/inaccessible methods in TDEConfigSkeleton ------------------------------------------------------------------------ -r117 | (jim) | 2006-01-18 23:00:34 -0800 (Wed, 18 Jan 2006) | 3 lines +r117 | (no author) | 2006-01-18 23:00:34 -0800 (Wed, 18 Jan 2006) | 3 lines correct versioning error on addItem* methods in TDEConfigSkeleton ------------------------------------------------------------------------ -r116 | (jim) | 2006-01-18 22:08:35 -0800 (Wed, 18 Jan 2006) | 3 lines +r116 | (no author) | 2006-01-18 22:08:35 -0800 (Wed, 18 Jan 2006) | 3 lines fixes for backward compatibility with older KDE, gcc, sip ------------------------------------------------------------------------ -r115 | (jim) | 2006-01-18 21:12:02 -0800 (Wed, 18 Jan 2006) | 2 lines +r115 | (no author) | 2006-01-18 21:12:02 -0800 (Wed, 18 Jan 2006) | 2 lines PyKDE for KDE 3.5.0 complete ------------------------------------------------------------------------ -r114 | (jim) | 2006-01-17 01:51:20 -0800 (Tue, 17 Jan 2006) | 2 lines +r114 | (no author) | 2006-01-17 01:51:20 -0800 (Tue, 17 Jan 2006) | 2 lines all modules working for KDE 3.4.3 - minor fixes ------------------------------------------------------------------------ -r113 | (jim) | 2006-01-16 22:13:25 -0800 (Mon, 16 Jan 2006) | 2 lines +r113 | (no author) | 2006-01-16 22:13:25 -0800 (Mon, 16 Jan 2006) | 2 lines tdeabc, tderesources touchup ------------------------------------------------------------------------ -r112 | (jim) | 2006-01-16 21:57:28 -0800 (Mon, 16 Jan 2006) | 2 lines +r112 | (no author) | 2006-01-16 21:57:28 -0800 (Mon, 16 Jan 2006) | 2 lines update extra/ for KDE 3.5.0 ------------------------------------------------------------------------ -r111 | (jim) | 2006-01-16 21:56:14 -0800 (Mon, 16 Jan 2006) | 2 lines +r111 | (no author) | 2006-01-16 21:56:14 -0800 (Mon, 16 Jan 2006) | 2 lines minor fix ------------------------------------------------------------------------ -r109 | (jim) | 2006-01-16 20:35:03 -0800 (Mon, 16 Jan 2006) | 2 lines +r109 | (no author) | 2006-01-16 20:35:03 -0800 (Mon, 16 Jan 2006) | 2 lines yet more debugging tdeabc, tderesources ------------------------------------------------------------------------ -r108 | (jim) | 2006-01-16 20:22:55 -0800 (Mon, 16 Jan 2006) | 2 lines +r108 | (no author) | 2006-01-16 20:22:55 -0800 (Mon, 16 Jan 2006) | 2 lines more debugging tdeabc, tderesources ------------------------------------------------------------------------ -r107 | (jim) | 2006-01-16 20:15:50 -0800 (Mon, 16 Jan 2006) | 2 lines +r107 | (no author) | 2006-01-16 20:15:50 -0800 (Mon, 16 Jan 2006) | 2 lines more tdeabc, kresource debugging ------------------------------------------------------------------------ -r106 | (jim) | 2006-01-16 20:12:37 -0800 (Mon, 16 Jan 2006) | 2 lines +r106 | (no author) | 2006-01-16 20:12:37 -0800 (Mon, 16 Jan 2006) | 2 lines tdeabc, kresource debugging ------------------------------------------------------------------------ -r105 | (jim) | 2006-01-16 20:08:37 -0800 (Mon, 16 Jan 2006) | 2 lines +r105 | (no author) | 2006-01-16 20:08:37 -0800 (Mon, 16 Jan 2006) | 2 lines tdeabc, tderesources through KDE 3.4.3 ------------------------------------------------------------------------ -r104 | (jim) | 2006-01-16 18:33:10 -0800 (Mon, 16 Jan 2006) | 2 lines +r104 | (no author) | 2006-01-16 18:33:10 -0800 (Mon, 16 Jan 2006) | 2 lines removed erroneous tderesources .diff file ------------------------------------------------------------------------ -r103 | (jim) | 2006-01-16 18:24:05 -0800 (Mon, 16 Jan 2006) | 3 lines +r103 | (no author) | 2006-01-16 18:24:05 -0800 (Mon, 16 Jan 2006) | 3 lines more tdeabc and tderesources debugging - compiles through KDE 330 ------------------------------------------------------------------------ -r102 | (jim) | 2006-01-16 00:47:43 -0800 (Mon, 16 Jan 2006) | 2 lines +r102 | (no author) | 2006-01-16 00:47:43 -0800 (Mon, 16 Jan 2006) | 2 lines debug configure.py, tdeabc, tderesources ------------------------------------------------------------------------ -r101 | (jim) | 2006-01-15 22:27:45 -0800 (Sun, 15 Jan 2006) | 2 lines +r101 | (no author) | 2006-01-15 22:27:45 -0800 (Sun, 15 Jan 2006) | 2 lines fixed typo in configure.py ------------------------------------------------------------------------ -r100 | (jim) | 2006-01-15 22:22:50 -0800 (Sun, 15 Jan 2006) | 2 lines +r100 | (no author) | 2006-01-15 22:22:50 -0800 (Sun, 15 Jan 2006) | 2 lines added tdeabc and tderesources through KDE 3.3.0 ------------------------------------------------------------------------ -r97 | (jim) | 2006-01-15 15:04:44 -0800 (Sun, 15 Jan 2006) | 2 lines +r97 | (no author) | 2006-01-15 15:04:44 -0800 (Sun, 15 Jan 2006) | 2 lines upgrade to KDE 3.4.3 ------------------------------------------------------------------------ -r95 | (jim) | 2006-01-15 10:47:15 -0800 (Sun, 15 Jan 2006) | 2 lines +r95 | (no author) | 2006-01-15 10:47:15 -0800 (Sun, 15 Jan 2006) | 2 lines added 'extra' files ------------------------------------------------------------------------ -r94 | (jim) | 2006-01-15 10:26:53 -0800 (Sun, 15 Jan 2006) | 2 lines +r94 | (no author) | 2006-01-15 10:26:53 -0800 (Sun, 15 Jan 2006) | 2 lines Update to KDE 3.4.2 ------------------------------------------------------------------------ -r93 | (jim) | 2006-01-14 14:12:52 -0800 (Sat, 14 Jan 2006) | 4 lines +r93 | (no author) | 2006-01-14 14:12:52 -0800 (Sat, 14 Jan 2006) | 4 lines typedef'd IntList from TQValueList<int> so IntList() can be used as intializer for defaults; removed C++ for second ctors ItemInt64 and ItemUInt64 ------------------------------------------------------------------------ -r92 | (jim) | 2006-01-14 14:03:35 -0800 (Sat, 14 Jan 2006) | 2 lines +r92 | (no author) | 2006-01-14 14:03:35 -0800 (Sat, 14 Jan 2006) | 2 lines reversed tdecore/tdeconfigskeleton change ------------------------------------------------------------------------ -r91 | (jim) | 2006-01-14 13:40:37 -0800 (Sat, 14 Jan 2006) | 2 lines +r91 | (no author) | 2006-01-14 13:40:37 -0800 (Sat, 14 Jan 2006) | 2 lines remove erroneous files ------------------------------------------------------------------------ -r90 | (jim) | 2006-01-14 13:38:39 -0800 (Sat, 14 Jan 2006) | 5 lines +r90 | (no author) | 2006-01-14 13:38:39 -0800 (Sat, 14 Jan 2006) | 5 lines Fix sio syntax errors in tdecore/tdeconfigskeleton.sip (TQValueList<int>() as arg default value) and @@ -163,7 +340,7 @@ tdeio/slaveinterface.sip (%TypeHeaderCode in namespace instead of %ModuleHeaderCode outside) ------------------------------------------------------------------------ -r89 | (jim) | 2006-01-14 13:25:39 -0800 (Sat, 14 Jan 2006) | 5 lines +r89 | (no author) | 2006-01-14 13:25:39 -0800 (Sat, 14 Jan 2006) | 5 lines Upgrade to sip snapshot (future sip 4.4 - sipTransferObj stuff and eliminate most typedefs to prevent auto mapped types); add @@ -171,46 +348,46 @@ patch code to TDEConfigSkeleton addItem* and Item* ctors for scalar types;minor bugfixes (sipForceConvertToTQString anachronisms) ------------------------------------------------------------------------ -r88 | (jim) | 2005-12-18 11:20:55 -0800 (Sun, 18 Dec 2005) | 2 lines +r88 | (no author) | 2005-12-18 11:20:55 -0800 (Sun, 18 Dec 2005) | 2 lines Version dirSize in kdirsize.sip for older KDE ------------------------------------------------------------------------ -r87 | (jim) | 2005-12-18 09:51:33 -0800 (Sun, 18 Dec 2005) | 4 lines +r87 | (no author) | 2005-12-18 09:51:33 -0800 (Sun, 18 Dec 2005) | 4 lines Fixed versioning bug for enum Other in tdeshortcutlist.sip; added fully-qualified names to two 'Other' arguments in method calls ------------------------------------------------------------------------ -r86 | (jim) | 2005-12-17 14:44:01 -0800 (Sat, 17 Dec 2005) | 3 lines +r86 | (no author) | 2005-12-17 14:44:01 -0800 (Sat, 17 Dec 2005) | 3 lines Removed incorrect (later version) %Includes from sip.in files ------------------------------------------------------------------------ -r85 | (jim) | 2005-12-17 14:24:58 -0800 (Sat, 17 Dec 2005) | 2 lines +r85 | (no author) | 2005-12-17 14:24:58 -0800 (Sat, 17 Dec 2005) | 2 lines Added missing @mark@ to sip.in files ------------------------------------------------------------------------ -r84 | (jim) | 2005-12-17 13:39:26 -0800 (Sat, 17 Dec 2005) | 3 lines +r84 | (no author) | 2005-12-17 13:39:26 -0800 (Sat, 17 Dec 2005) | 3 lines Removed longlong/ulonglong from kzip (now in tdecore for older KDE versions), and versioned TQPtrList<TDEConfigDialogManager> ------------------------------------------------------------------------ -r83 | (jim) | 2005-12-17 13:28:33 -0800 (Sat, 17 Dec 2005) | 2 lines +r83 | (no author) | 2005-12-17 13:28:33 -0800 (Sat, 17 Dec 2005) | 2 lines Extended longlong and ulonglong to earlier KDE versions ------------------------------------------------------------------------ -r82 | (jim) | 2005-10-15 17:40:13 -0700 (Sat, 15 Oct 2005) | 2 lines +r82 | (no author) | 2005-10-15 17:40:13 -0700 (Sat, 15 Oct 2005) | 2 lines Updated %Timeline for KDE 3.4.1 ------------------------------------------------------------------------ -r81 | (jim) | 2005-10-15 17:38:51 -0700 (Sat, 15 Oct 2005) | 5 lines +r81 | (no author) | 2005-10-15 17:38:51 -0700 (Sat, 15 Oct 2005) | 5 lines Create ChangeLog from svn logs Change PyKDE version to 3.5.0 @@ -218,18 +395,18 @@ Update KDE versions to 3.4.1 ------------------------------------------------------------------------ -r80 | (jim) | 2005-10-15 17:23:54 -0700 (Sat, 15 Oct 2005) | 3 lines +r80 | (no author) | 2005-10-15 17:23:54 -0700 (Sat, 15 Oct 2005) | 3 lines Modified configure.py to detect compiler and set default concatenation appropriately ------------------------------------------------------------------------ -r79 | (jim) | 2005-10-15 17:22:13 -0700 (Sat, 15 Oct 2005) | 2 lines +r79 | (no author) | 2005-10-15 17:22:13 -0700 (Sat, 15 Oct 2005) | 2 lines -fixup +fixup ------------------------------------------------------------------------ -r78 | (jim) | 2005-10-13 11:45:39 -0700 (Thu, 13 Oct 2005) | 8 lines +r78 | (no author) | 2005-10-13 11:45:39 -0700 (Thu, 13 Oct 2005) | 8 lines Replaced sipNewCppToSelf instances with sipBuildResult Cleaned up sip files for gcc 3.4.x/4.0.x compatibility @@ -240,362 +417,362 @@ Updated configure.py to use pyqtconfig.py for TQt environment info Backed out konsolepart code (undefined symbol problem) ------------------------------------------------------------------------ -r76 | (jim) | 2005-07-27 23:27:34 -0700 (Wed, 27 Jul 2005) | 2 lines +r76 | (no author) | 2005-07-27 23:27:34 -0700 (Wed, 27 Jul 2005) | 2 lines update configure.py for konsolePart ------------------------------------------------------------------------ -r75 | (jim) | 2005-07-27 21:46:51 -0700 (Wed, 27 Jul 2005) | 2 lines +r75 | (no author) | 2005-07-27 21:46:51 -0700 (Wed, 27 Jul 2005) | 2 lines added ConvertToSubclassCode entry for konsolePart ------------------------------------------------------------------------ -r74 | (jim) | 2005-07-26 16:58:53 -0700 (Tue, 26 Jul 2005) | 2 lines +r74 | (no author) | 2005-07-26 16:58:53 -0700 (Tue, 26 Jul 2005) | 2 lines added konsolePart class ------------------------------------------------------------------------ -r73 | (jim) | 2005-06-28 16:27:53 -0700 (Tue, 28 Jun 2005) | 2 lines +r73 | (no author) | 2005-06-28 16:27:53 -0700 (Tue, 28 Jun 2005) | 2 lines KDE 3.4.1 upgrade ------------------------------------------------------------------------ -r72 | (jim) | 2005-06-28 14:58:07 -0700 (Tue, 28 Jun 2005) | 2 lines +r72 | (no author) | 2005-06-28 14:58:07 -0700 (Tue, 28 Jun 2005) | 2 lines added bool type to DCOP extensions ------------------------------------------------------------------------ -r71 | (jim) | 2005-06-18 19:16:03 -0700 (Sat, 18 Jun 2005) | 2 lines +r71 | (no author) | 2005-06-18 19:16:03 -0700 (Sat, 18 Jun 2005) | 2 lines Added explicit link of tdeui for tdespell module ------------------------------------------------------------------------ -r70 | (jim) | 2005-06-18 17:59:10 -0700 (Sat, 18 Jun 2005) | 2 lines +r70 | (no author) | 2005-06-18 17:59:10 -0700 (Sat, 18 Jun 2005) | 2 lines Added private dtors to keep sip 4.2 happy ------------------------------------------------------------------------ -r69 | (jim) | 2005-03-18 16:05:34 -0800 (Fri, 18 Mar 2005) | 3 lines +r69 | (no author) | 2005-03-18 16:05:34 -0800 (Fri, 18 Mar 2005) | 3 lines fixed cast in KURL::List operator + that was causing problems for gcc 4 ------------------------------------------------------------------------ -r68 | (jim) | 2005-03-16 08:50:52 -0800 (Wed, 16 Mar 2005) | 2 lines +r68 | (no author) | 2005-03-16 08:50:52 -0800 (Wed, 16 Mar 2005) | 2 lines patch for DCOP line breaks ------------------------------------------------------------------------ -r67 | (jim) | 2005-03-16 08:49:37 -0800 (Wed, 16 Mar 2005) | 2 lines +r67 | (no author) | 2005-03-16 08:49:37 -0800 (Wed, 16 Mar 2005) | 2 lines Fix typos in previous patch ------------------------------------------------------------------------ -r66 | (jim) | 2005-03-15 16:07:18 -0800 (Tue, 15 Mar 2005) | 2 lines +r66 | (no author) | 2005-03-15 16:07:18 -0800 (Tue, 15 Mar 2005) | 2 lines Added ConvertToSubclassCode blocks for tdemdi, tdeutils ------------------------------------------------------------------------ -r65 | (jim) | 2005-03-10 10:41:57 -0800 (Thu, 10 Mar 2005) | 2 lines +r65 | (no author) | 2005-03-10 10:41:57 -0800 (Thu, 10 Mar 2005) | 2 lines added kkeyserver.h to extra/kde340 ------------------------------------------------------------------------ -r64 | (jim) | 2005-03-08 14:14:58 -0800 (Tue, 08 Mar 2005) | 3 lines +r64 | (no author) | 2005-03-08 14:14:58 -0800 (Tue, 08 Mar 2005) | 3 lines Fixed case problem in configure.py distro check; fixed default value in KURL::cleanPath ------------------------------------------------------------------------ -r62 | (jim) | 2005-03-06 21:31:50 -0800 (Sun, 06 Mar 2005) | 2 lines +r62 | (no author) | 2005-03-06 21:31:50 -0800 (Sun, 06 Mar 2005) | 2 lines fixed emums in templates/annotated ------------------------------------------------------------------------ -r61 | (jim) | 2005-03-06 21:30:48 -0800 (Sun, 06 Mar 2005) | 2 lines +r61 | (no author) | 2005-03-06 21:30:48 -0800 (Sun, 06 Mar 2005) | 2 lines fixed enums in examples, templates; fixed TDEIconThemeDir ref ------------------------------------------------------------------------ -r60 | (jim) | 2005-03-05 00:57:44 -0800 (Sat, 05 Mar 2005) | 2 lines +r60 | (no author) | 2005-03-05 00:57:44 -0800 (Sat, 05 Mar 2005) | 2 lines added -L option for lib path ------------------------------------------------------------------------ -r59 | (jim) | 2005-03-05 00:47:24 -0800 (Sat, 05 Mar 2005) | 2 lines +r59 | (no author) | 2005-03-05 00:47:24 -0800 (Sat, 05 Mar 2005) | 2 lines removed kjs support ------------------------------------------------------------------------ -r58 | (jim) | 2005-03-05 00:42:59 -0800 (Sat, 05 Mar 2005) | 2 lines +r58 | (no author) | 2005-03-05 00:42:59 -0800 (Sat, 05 Mar 2005) | 2 lines update extra/kde340 h files ------------------------------------------------------------------------ -r57 | (jim) | 2005-03-05 00:36:09 -0800 (Sat, 05 Mar 2005) | 2 lines +r57 | (no author) | 2005-03-05 00:36:09 -0800 (Sat, 05 Mar 2005) | 2 lines update .easibox - extra/kde340 ------------------------------------------------------------------------ -r56 | (jim) | 2005-03-05 00:34:34 -0800 (Sat, 05 Mar 2005) | 2 lines +r56 | (no author) | 2005-03-05 00:34:34 -0800 (Sat, 05 Mar 2005) | 2 lines added extra/kde340 ------------------------------------------------------------------------ -r55 | (jim) | 2005-03-04 23:58:35 -0800 (Fri, 04 Mar 2005) | 2 lines +r55 | (no author) | 2005-03-04 23:58:35 -0800 (Fri, 04 Mar 2005) | 2 lines tdemdimod.sip.in one more time ------------------------------------------------------------------------ -r54 | (jim) | 2005-03-04 23:53:37 -0800 (Fri, 04 Mar 2005) | 2 lines +r54 | (no author) | 2005-03-04 23:53:37 -0800 (Fri, 04 Mar 2005) | 2 lines tdemdimod.sip.in again ------------------------------------------------------------------------ -r53 | (jim) | 2005-03-04 23:37:43 -0800 (Fri, 04 Mar 2005) | 2 lines +r53 | (no author) | 2005-03-04 23:37:43 -0800 (Fri, 04 Mar 2005) | 2 lines fixed tdemdimod.sip.in and tdeutils.sip.in ------------------------------------------------------------------------ -r52 | (jim) | 2005-03-04 23:08:29 -0800 (Fri, 04 Mar 2005) | 2 lines +r52 | (no author) | 2005-03-04 23:08:29 -0800 (Fri, 04 Mar 2005) | 2 lines correct qt path in tdeutils.sip.in ------------------------------------------------------------------------ -r51 | (jim) | 2005-03-04 23:04:54 -0800 (Fri, 04 Mar 2005) | 2 lines +r51 | (no author) | 2005-03-04 23:04:54 -0800 (Fri, 04 Mar 2005) | 2 lines %Include bytearray.sip missing from tdecore.sip.in ------------------------------------------------------------------------ -r50 | (jim) | 2005-03-04 22:59:10 -0800 (Fri, 04 Mar 2005) | 2 lines +r50 | (no author) | 2005-03-04 22:59:10 -0800 (Fri, 04 Mar 2005) | 2 lines fixed missing %Feature in dcopmod.sip.in ------------------------------------------------------------------------ -r49 | (jim) | 2005-03-04 22:55:43 -0800 (Fri, 04 Mar 2005) | 2 lines +r49 | (no author) | 2005-03-04 22:55:43 -0800 (Fri, 04 Mar 2005) | 2 lines fixed paths in sip.in files ------------------------------------------------------------------------ -r48 | (jim) | 2005-03-04 22:49:00 -0800 (Fri, 04 Mar 2005) | 2 lines +r48 | (no author) | 2005-03-04 22:49:00 -0800 (Fri, 04 Mar 2005) | 2 lines doc updates for PyKDE 4.0 ------------------------------------------------------------------------ -r47 | (jim) | 2005-03-04 22:28:30 -0800 (Fri, 04 Mar 2005) | 2 lines +r47 | (no author) | 2005-03-04 22:28:30 -0800 (Fri, 04 Mar 2005) | 2 lines PyKDE 4.0 docs ------------------------------------------------------------------------ -r46 | (jim) | 2005-03-04 22:02:00 -0800 (Fri, 04 Mar 2005) | 2 lines +r46 | (no author) | 2005-03-04 22:02:00 -0800 (Fri, 04 Mar 2005) | 2 lines new configure.py for PyKDE 4.0 ------------------------------------------------------------------------ -r45 | (jim) | 2005-03-04 22:00:42 -0800 (Fri, 04 Mar 2005) | 2 lines +r45 | (no author) | 2005-03-04 22:00:42 -0800 (Fri, 04 Mar 2005) | 2 lines PyKDE 4.0 ------------------------------------------------------------------------ -r42 | (jim) | 2005-03-01 16:20:01 -0800 (Tue, 01 Mar 2005) | 2 lines +r42 | (no author) | 2005-03-01 16:20:01 -0800 (Tue, 01 Mar 2005) | 2 lines Fixed TDEActionCollection for Mandrake ------------------------------------------------------------------------ -r41 | (jim) | 2005-03-01 14:55:49 -0800 (Tue, 01 Mar 2005) | 2 lines +r41 | (no author) | 2005-03-01 14:55:49 -0800 (Tue, 01 Mar 2005) | 2 lines Fixed pid_t typing problems (TQValueList) ------------------------------------------------------------------------ -r40 | (jim) | 2005-03-01 13:34:04 -0800 (Tue, 01 Mar 2005) | 2 lines +r40 | (no author) | 2005-03-01 13:34:04 -0800 (Tue, 01 Mar 2005) | 2 lines Changed pid_t type from int to long; enabled KParts::URLArgs::metaData () ------------------------------------------------------------------------ -r39 | (jim) | 2005-02-28 23:49:09 -0800 (Mon, 28 Feb 2005) | 4 lines +r39 | (no author) | 2005-02-28 23:49:09 -0800 (Mon, 28 Feb 2005) | 4 lines KFileMetaInfo typedefs removed; TDEProcessController versioning corrected; TDERecentDirs (and extra/ hfiles) added; pytde332.prj added ------------------------------------------------------------------------ -r38 | (jim) | 2005-02-28 22:34:42 -0800 (Mon, 28 Feb 2005) | 2 lines +r38 | (no author) | 2005-02-28 22:34:42 -0800 (Mon, 28 Feb 2005) | 2 lines added TDEHTMLPart to %ConvertToSubclassCode; install kdepyuic ------------------------------------------------------------------------ -r37 | (jim) | 2005-02-03 00:07:38 -0800 (Thu, 03 Feb 2005) | 2 lines +r37 | (no author) | 2005-02-03 00:07:38 -0800 (Thu, 03 Feb 2005) | 2 lines Added KURL import to dcopext.py ------------------------------------------------------------------------ -r36 | (jim) | 2005-01-04 11:38:01 -0800 (Tue, 04 Jan 2005) | 2 lines +r36 | (no author) | 2005-01-04 11:38:01 -0800 (Tue, 04 Jan 2005) | 2 lines Add extra subdir ------------------------------------------------------------------------ -r35 | (jim) | 2005-01-03 21:38:17 -0800 (Mon, 03 Jan 2005) | 2 lines +r35 | (no author) | 2005-01-03 21:38:17 -0800 (Mon, 03 Jan 2005) | 2 lines KDE 3.3.2 and sip 4.2 updates ------------------------------------------------------------------------ -r33 | (jim) | 2004-11-28 13:58:07 -0800 (Sun, 28 Nov 2004) | 2 lines +r33 | (no author) | 2004-11-28 13:58:07 -0800 (Sun, 28 Nov 2004) | 2 lines Modified tdemdidefines.sip for sip 4.2 enumerator name problem ------------------------------------------------------------------------ -r32 | (jim) | 2004-11-28 13:56:19 -0800 (Sun, 28 Nov 2004) | 2 lines +r32 | (no author) | 2004-11-28 13:56:19 -0800 (Sun, 28 Nov 2004) | 2 lines Removed pytdeconfig.py from source control ------------------------------------------------------------------------ -r31 | (jim) | 2004-11-27 23:29:03 -0800 (Sat, 27 Nov 2004) | 2 lines +r31 | (no author) | 2004-11-27 23:29:03 -0800 (Sat, 27 Nov 2004) | 2 lines docs ------------------------------------------------------------------------ -r30 | (jim) | 2004-11-27 23:07:07 -0800 (Sat, 27 Nov 2004) | 2 lines +r30 | (no author) | 2004-11-27 23:07:07 -0800 (Sat, 27 Nov 2004) | 2 lines docs ------------------------------------------------------------------------ -r29 | (jim) | 2004-11-27 22:17:49 -0800 (Sat, 27 Nov 2004) | 2 lines +r29 | (no author) | 2004-11-27 22:17:49 -0800 (Sat, 27 Nov 2004) | 2 lines Missing comma ------------------------------------------------------------------------ -r28 | (jim) | 2004-11-27 22:16:34 -0800 (Sat, 27 Nov 2004) | 2 lines +r28 | (no author) | 2004-11-27 22:16:34 -0800 (Sat, 27 Nov 2004) | 2 lines PyKDE for KDE 3.3.1 ------------------------------------------------------------------------ -r27 | (jim) | 2004-11-27 21:16:55 -0800 (Sat, 27 Nov 2004) | 2 lines +r27 | (no author) | 2004-11-27 21:16:55 -0800 (Sat, 27 Nov 2004) | 2 lines Revise project files ------------------------------------------------------------------------ -r26 | (jim) | 2004-11-27 17:47:35 -0800 (Sat, 27 Nov 2004) | 2 lines +r26 | (no author) | 2004-11-27 17:47:35 -0800 (Sat, 27 Nov 2004) | 2 lines Updating to KDE 3.3.1 ------------------------------------------------------------------------ -r25 | (jim) | 2004-08-25 16:43:40 -0700 (Wed, 25 Aug 2004) | 2 lines +r25 | (no author) | 2004-08-25 16:43:40 -0700 (Wed, 25 Aug 2004) | 2 lines Updated change log ------------------------------------------------------------------------ -r24 | (jim) | 2004-08-25 16:41:33 -0700 (Wed, 25 Aug 2004) | 2 lines +r24 | (no author) | 2004-08-25 16:41:33 -0700 (Wed, 25 Aug 2004) | 2 lines Updated numbering to 3.11.3 ------------------------------------------------------------------------ -r23 | (jim) | 2004-08-25 15:34:33 -0700 (Wed, 25 Aug 2004) | 2 lines +r23 | (no author) | 2004-08-25 15:34:33 -0700 (Wed, 25 Aug 2004) | 2 lines Added post proc for WId in twinmodule signals ------------------------------------------------------------------------ -r22 | (jim) | 2004-08-21 16:50:33 -0700 (Sat, 21 Aug 2004) | 2 lines +r22 | (no author) | 2004-08-21 16:50:33 -0700 (Sat, 21 Aug 2004) | 2 lines same tdehtml_part patch as the previous rev ??? ------------------------------------------------------------------------ -r21 | (jim) | 2004-08-21 16:42:06 -0700 (Sat, 21 Aug 2004) | 2 lines +r21 | (no author) | 2004-08-21 16:42:06 -0700 (Sat, 21 Aug 2004) | 2 lines tdehtml_part: fixed enum values for sip3.10.2 with KDE 3.3.0 ------------------------------------------------------------------------ -r20 | (jim) | 2004-08-21 01:10:05 -0700 (Sat, 21 Aug 2004) | 2 lines +r20 | (no author) | 2004-08-21 01:10:05 -0700 (Sat, 21 Aug 2004) | 2 lines Update version numbers in docs ------------------------------------------------------------------------ -r19 | (jim) | 2004-08-21 01:03:27 -0700 (Sat, 21 Aug 2004) | 2 lines +r19 | (no author) | 2004-08-21 01:03:27 -0700 (Sat, 21 Aug 2004) | 2 lines docs for final release ------------------------------------------------------------------------ -r18 | (jim) | 2004-08-20 18:50:22 -0700 (Fri, 20 Aug 2004) | 2 lines +r18 | (no author) | 2004-08-20 18:50:22 -0700 (Fri, 20 Aug 2004) | 2 lines Fixed access specifier for copy ctor on TDEProcessController ------------------------------------------------------------------------ -r17 | (jim) | 2004-08-20 10:00:27 -0700 (Fri, 20 Aug 2004) | 2 lines +r17 | (no author) | 2004-08-20 10:00:27 -0700 (Fri, 20 Aug 2004) | 2 lines Updated to KDE 3.3.0 final ------------------------------------------------------------------------ -r16 | (jim) | 2004-08-20 09:59:28 -0700 (Fri, 20 Aug 2004) | 2 lines +r16 | (no author) | 2004-08-20 09:59:28 -0700 (Fri, 20 Aug 2004) | 2 lines Removed tdehtml_part.sip (different versions for different KDE versions) ------------------------------------------------------------------------ -r15 | (jim) | 2004-08-19 23:52:31 -0700 (Thu, 19 Aug 2004) | 2 lines +r15 | (no author) | 2004-08-19 23:52:31 -0700 (Thu, 19 Aug 2004) | 2 lines Added svnmerge, svnmergedocs ------------------------------------------------------------------------ -r14 | (jim) | 2004-08-16 19:42:57 -0700 (Mon, 16 Aug 2004) | 2 lines +r14 | (no author) | 2004-08-16 19:42:57 -0700 (Mon, 16 Aug 2004) | 2 lines change spaces to tabs in postproc/appQuit ------------------------------------------------------------------------ -r13 | (jim) | 2004-08-16 19:41:25 -0700 (Mon, 16 Aug 2004) | 2 lines +r13 | (no author) | 2004-08-16 19:41:25 -0700 (Mon, 16 Aug 2004) | 2 lines Save doc tool mods ------------------------------------------------------------------------ -r12 | (jim) | 2004-08-16 17:44:37 -0700 (Mon, 16 Aug 2004) | 2 lines +r12 | (no author) | 2004-08-16 17:44:37 -0700 (Mon, 16 Aug 2004) | 2 lines Updated docs ------------------------------------------------------------------------ -r11 | (jim) | 2004-08-16 17:23:33 -0700 (Mon, 16 Aug 2004) | 2 lines +r11 | (no author) | 2004-08-16 17:23:33 -0700 (Mon, 16 Aug 2004) | 2 lines Patched qvariant.h problem in tdecore ------------------------------------------------------------------------ -r10 | (jim) | 2004-08-16 16:40:43 -0700 (Mon, 16 Aug 2004) | 2 lines +r10 | (no author) | 2004-08-16 16:40:43 -0700 (Mon, 16 Aug 2004) | 2 lines Corrected kuniqueapplication ------------------------------------------------------------------------ -r9 | (jim) | 2004-08-16 14:43:51 -0700 (Mon, 16 Aug 2004) | 2 lines +r9 | (no author) | 2004-08-16 14:43:51 -0700 (Mon, 16 Aug 2004) | 2 lines Fixed h file problems for KDE3.0.x; fixed LONG_LONG for KDE3.0.x with Python 2.3 ------------------------------------------------------------------------ -r8 | (jim) | 2004-08-15 21:49:27 -0700 (Sun, 15 Aug 2004) | 2 lines +r8 | (no author) | 2004-08-15 21:49:27 -0700 (Sun, 15 Aug 2004) | 2 lines version before access hides access for KDE < 3.2 in kprocctrl.sip ------------------------------------------------------------------------ -r7 | (jim) | 2004-08-15 12:21:23 -0700 (Sun, 15 Aug 2004) | 2 lines +r7 | (no author) | 2004-08-15 12:21:23 -0700 (Sun, 15 Aug 2004) | 2 lines Corrected error - configure.py spippath defined in wrong place ------------------------------------------------------------------------ -r6 | (jim) | 2004-08-15 12:19:37 -0700 (Sun, 15 Aug 2004) | 2 lines +r6 | (no author) | 2004-08-15 12:19:37 -0700 (Sun, 15 Aug 2004) | 2 lines Added tdehtml_part.sip versions ------------------------------------------------------------------------ -r5 | (jim) | 2004-08-15 12:14:27 -0700 (Sun, 15 Aug 2004) | 3 lines +r5 | (no author) | 2004-08-15 12:14:27 -0700 (Sun, 15 Aug 2004) | 3 lines Changes to configure.py for tdehtml/tdeutils when KDE < 3.3.0 and tdeutils isn't needed/supported ------------------------------------------------------------------------ -r4 | (jim) | 2004-08-15 12:04:57 -0700 (Sun, 15 Aug 2004) | 2 lines +r4 | (no author) | 2004-08-15 12:04:57 -0700 (Sun, 15 Aug 2004) | 2 lines Patches for building with -i option (no concatenation) ------------------------------------------------------------------------ -r3 | (jim) | 2004-08-15 09:13:47 -0700 (Sun, 15 Aug 2004) | 2 lines +r3 | (no author) | 2004-08-15 09:13:47 -0700 (Sun, 15 Aug 2004) | 2 lines Ready for KDE 3.3.0beta2 ------------------------------------------------------------------------ -r2 | (jim) | 2004-08-13 22:35:48 -0700 (Fri, 13 Aug 2004) | 2 lines +r2 | (no author) | 2004-08-13 22:35:48 -0700 (Fri, 13 Aug 2004) | 2 lines Initial import diff --git a/Changelog b/Changelog deleted file mode 100644 index affd892..0000000 --- a/Changelog +++ /dev/null @@ -1,779 +0,0 @@ ------------------------------------------------------------------------- -r160 | (no author) | 2006-09-22 00:23:44 -0700 (Fri, 22 Sep 2006) | 2 lines - -tdeio/tdefileshare changed in error - reverted - ------------------------------------------------------------------------- -r159 | (no author) | 2006-09-22 00:22:47 -0700 (Fri, 22 Sep 2006) | 3 lines - -Bumped min versions: sip >= 4.4.0, PyTQt >= 3.16.0, -TQt >= 3.2.0 - ------------------------------------------------------------------------- -r158 | (no author) | 2006-09-22 00:16:56 -0700 (Fri, 22 Sep 2006) | 3 lines - -version error KMimeType::List; changed -x to -t for -%Platforms in configure.py, added "ALL" generic platform - ------------------------------------------------------------------------- -r157 | (no author) | 2006-09-21 23:19:39 -0700 (Thu, 21 Sep 2006) | 3 lines - -configure.py searches for lib64; non-functional PyKDE -version methods deleted (and in docs) - ------------------------------------------------------------------------- -r156 | (no author) | 2006-09-21 17:56:59 -0700 (Thu, 21 Sep 2006) | 2 lines - -update sip.in and diff files for tdeparts.konsole_part - ------------------------------------------------------------------------- -r155 | (no author) | 2006-09-21 17:54:25 -0700 (Thu, 21 Sep 2006) | 2 lines - -set konsolepart for KDE3.5.0 or greater only - ------------------------------------------------------------------------- -r154 | (no author) | 2006-09-21 14:12:29 -0700 (Thu, 21 Sep 2006) | 2 lines - -remove pyc files from svn - ------------------------------------------------------------------------- -r153 | (no author) | 2006-09-21 14:11:58 -0700 (Thu, 21 Sep 2006) | 2 lines - -konsole_part stuff - ------------------------------------------------------------------------- -r152 | (no author) | 2006-09-21 10:13:58 -0700 (Thu, 21 Sep 2006) | 3 lines - -added konsole_part.h to versions missing it; added -extra/kde353 to base fileset - ------------------------------------------------------------------------- -r150 | (no author) | 2006-09-21 08:38:43 -0700 (Thu, 21 Sep 2006) | 3 lines - -More cleanup for 3.16 release; added konsole_part again; -miscellaneous small bug fixes - ------------------------------------------------------------------------- -r149 | (no author) | 2006-09-19 16:26:43 -0700 (Tue, 19 Sep 2006) | 2 lines - -Upgrade to KDE 3.5.3 - ------------------------------------------------------------------------- -r148 | (no author) | 2006-09-19 16:24:33 -0700 (Tue, 19 Sep 2006) | 3 lines - -Cleaned up files for presip; minor fixes for 9/17 sip snapshot -Clean fileset - presip will build clean 3.5.3 from this set - ------------------------------------------------------------------------- -r145 | (no author) | 2006-05-26 21:49:46 -0700 (Fri, 26 May 2006) | 2 lines - -Deleted commented out TQList code - ------------------------------------------------------------------------- -r144 | (no author) | 2006-05-26 20:39:51 -0700 (Fri, 26 May 2006) | 2 lines - -Eliminate obsolete TQList/qlist.h references - ------------------------------------------------------------------------- -r143 | (no author) | 2006-05-25 01:54:27 -0700 (Thu, 25 May 2006) | 2 lines - -fix for KDE 3.1.x - ------------------------------------------------------------------------- -r142 | (no author) | 2006-05-22 19:26:54 -0700 (Mon, 22 May 2006) | 3 lines - -fixes for KDE < 3.2.0 in configure.py, tdeabc .diff files -and knotifydialog - ------------------------------------------------------------------------- -r141 | (no author) | 2006-05-22 00:38:44 -0700 (Mon, 22 May 2006) | 2 lines - -remove top-level (*mod.sip) files - ------------------------------------------------------------------------- -r140 | (no author) | 2006-05-21 20:27:45 -0700 (Sun, 21 May 2006) | 2 lines - -added extra/kde352 - ------------------------------------------------------------------------- -r139 | (no author) | 2006-05-21 20:06:53 -0700 (Sun, 21 May 2006) | 2 lines - -KDE 3.3.0 touchup - ------------------------------------------------------------------------- -r138 | (no author) | 2006-05-21 18:24:47 -0700 (Sun, 21 May 2006) | 2 lines - -clean up .sip.in files - ------------------------------------------------------------------------- -r137 | (no author) | 2006-05-21 15:46:13 -0700 (Sun, 21 May 2006) | 2 lines - -modifications for KDE 3.3.0 compatibility - ------------------------------------------------------------------------- -r136 | (no author) | 2006-05-21 04:59:30 -0700 (Sun, 21 May 2006) | 2 lines - -KDE 3.5.2 - ------------------------------------------------------------------------- -r135 | (no author) | 2006-05-20 15:27:11 -0700 (Sat, 20 May 2006) | 2 lines - -added 352 project file - ------------------------------------------------------------------------- -r133 | (no author) | 2006-05-19 00:53:46 -0700 (Fri, 19 May 2006) | 2 lines - -KDE 3.5.1 - ------------------------------------------------------------------------- -r132 | (no author) | 2006-01-27 13:00:18 -0800 (Fri, 27 Jan 2006) | 2 lines - -added missing method tdeabc/resourcefile.sip - ------------------------------------------------------------------------- -r131 | (no author) | 2006-01-26 19:27:45 -0800 (Thu, 26 Jan 2006) | 2 lines - -fully-qualified names in tdeabc/resourcefile.sip - ------------------------------------------------------------------------- -r130 | (no author) | 2006-01-26 16:53:44 -0800 (Thu, 26 Jan 2006) | 3 lines - -Put tdeabc/resourcefile.sip back into tdeabc for later -versions (missing in tdelibs tarball, but in trinity/include/tdeabc) - ------------------------------------------------------------------------- -r129 | (no author) | 2006-01-26 16:50:00 -0800 (Thu, 26 Jan 2006) | 3 lines - -Removed *mod.sip files from version control (user -generated) - ------------------------------------------------------------------------- -r128 | (no author) | 2006-01-26 16:46:27 -0800 (Thu, 26 Jan 2006) | 2 lines - -Updated tdeabc/resourcefile.sip - versioning - ------------------------------------------------------------------------- -r127 | (no author) | 2006-01-23 00:19:15 -0800 (Mon, 23 Jan 2006) | 2 lines - -typo in configure.py - ------------------------------------------------------------------------- -r126 | (no author) | 2006-01-22 23:08:28 -0800 (Sun, 22 Jan 2006) | 4 lines - -changed configure.py to concatenate by default for -gcc >= 4.0.3; deleted unneeded mapped type from -tdeio/global.sip - ------------------------------------------------------------------------- -r125 | (no author) | 2006-01-22 21:45:55 -0800 (Sun, 22 Jan 2006) | 8 lines - -modify configure.py to drop tderesources for KDE < 3.2; -version Resource class in tdeabc/resource.sip; version -64 bit read/write stuff in tdecore/tdeconfigbase.sip; -version copy ctor in tdecore/kprocctrl.sip; version -out longlong/ulonglong mapped types in tdeio/global.sip; -version one method in tdeio/tdesycoca.sip; fix line with -illegal char (?) in extensions/dcopexport.py - ------------------------------------------------------------------------- -r124 | (no author) | 2006-01-21 11:33:36 -0800 (Sat, 21 Jan 2006) | 2 lines - -removed kkeyserver.sip references from all .diff files - ------------------------------------------------------------------------- -r123 | (no author) | 2006-01-21 11:31:03 -0800 (Sat, 21 Jan 2006) | 2 lines - -updated docs - ------------------------------------------------------------------------- -r122 | (no author) | 2006-01-21 10:46:51 -0800 (Sat, 21 Jan 2006) | 2 lines - -fixed TOC links in classref doc files - ------------------------------------------------------------------------- -r121 | (no author) | 2006-01-21 01:20:30 -0800 (Sat, 21 Jan 2006) | 2 lines - -Initial doc update - ------------------------------------------------------------------------- -r120 | (no author) | 2006-01-20 17:37:06 -0800 (Fri, 20 Jan 2006) | 3 lines - -fixed TQValueList<TDEConfigSkeleton::ItemEnum::Choice> code -and fixed dcopexport.py handling of void return types - ------------------------------------------------------------------------- -r119 | (no author) | 2006-01-20 12:14:10 -0800 (Fri, 20 Jan 2006) | 2 lines - -added X11 include - ------------------------------------------------------------------------- -r118 | (no author) | 2006-01-18 23:27:15 -0800 (Wed, 18 Jan 2006) | 2 lines - -backed out ambiguous/inaccessible methods in TDEConfigSkeleton - ------------------------------------------------------------------------- -r117 | (no author) | 2006-01-18 23:00:34 -0800 (Wed, 18 Jan 2006) | 3 lines - -correct versioning error on addItem* methods in -TDEConfigSkeleton - ------------------------------------------------------------------------- -r116 | (no author) | 2006-01-18 22:08:35 -0800 (Wed, 18 Jan 2006) | 3 lines - -fixes for backward compatibility with older KDE, gcc, -sip - ------------------------------------------------------------------------- -r115 | (no author) | 2006-01-18 21:12:02 -0800 (Wed, 18 Jan 2006) | 2 lines - -PyKDE for KDE 3.5.0 complete - ------------------------------------------------------------------------- -r114 | (no author) | 2006-01-17 01:51:20 -0800 (Tue, 17 Jan 2006) | 2 lines - -all modules working for KDE 3.4.3 - minor fixes - ------------------------------------------------------------------------- -r113 | (no author) | 2006-01-16 22:13:25 -0800 (Mon, 16 Jan 2006) | 2 lines - -tdeabc, tderesources touchup - ------------------------------------------------------------------------- -r112 | (no author) | 2006-01-16 21:57:28 -0800 (Mon, 16 Jan 2006) | 2 lines - -update extra/ for KDE 3.5.0 - ------------------------------------------------------------------------- -r111 | (no author) | 2006-01-16 21:56:14 -0800 (Mon, 16 Jan 2006) | 2 lines - -minor fix - ------------------------------------------------------------------------- -r109 | (no author) | 2006-01-16 20:35:03 -0800 (Mon, 16 Jan 2006) | 2 lines - -yet more debugging tdeabc, tderesources - ------------------------------------------------------------------------- -r108 | (no author) | 2006-01-16 20:22:55 -0800 (Mon, 16 Jan 2006) | 2 lines - -more debugging tdeabc, tderesources - ------------------------------------------------------------------------- -r107 | (no author) | 2006-01-16 20:15:50 -0800 (Mon, 16 Jan 2006) | 2 lines - -more tdeabc, kresource debugging - ------------------------------------------------------------------------- -r106 | (no author) | 2006-01-16 20:12:37 -0800 (Mon, 16 Jan 2006) | 2 lines - -tdeabc, kresource debugging - ------------------------------------------------------------------------- -r105 | (no author) | 2006-01-16 20:08:37 -0800 (Mon, 16 Jan 2006) | 2 lines - -tdeabc, tderesources through KDE 3.4.3 - ------------------------------------------------------------------------- -r104 | (no author) | 2006-01-16 18:33:10 -0800 (Mon, 16 Jan 2006) | 2 lines - -removed erroneous tderesources .diff file - ------------------------------------------------------------------------- -r103 | (no author) | 2006-01-16 18:24:05 -0800 (Mon, 16 Jan 2006) | 3 lines - -more tdeabc and tderesources debugging - compiles -through KDE 330 - ------------------------------------------------------------------------- -r102 | (no author) | 2006-01-16 00:47:43 -0800 (Mon, 16 Jan 2006) | 2 lines - -debug configure.py, tdeabc, tderesources - ------------------------------------------------------------------------- -r101 | (no author) | 2006-01-15 22:27:45 -0800 (Sun, 15 Jan 2006) | 2 lines - -fixed typo in configure.py - ------------------------------------------------------------------------- -r100 | (no author) | 2006-01-15 22:22:50 -0800 (Sun, 15 Jan 2006) | 2 lines - -added tdeabc and tderesources through KDE 3.3.0 - ------------------------------------------------------------------------- -r97 | (no author) | 2006-01-15 15:04:44 -0800 (Sun, 15 Jan 2006) | 2 lines - -upgrade to KDE 3.4.3 - ------------------------------------------------------------------------- -r95 | (no author) | 2006-01-15 10:47:15 -0800 (Sun, 15 Jan 2006) | 2 lines - -added 'extra' files - ------------------------------------------------------------------------- -r94 | (no author) | 2006-01-15 10:26:53 -0800 (Sun, 15 Jan 2006) | 2 lines - -Update to KDE 3.4.2 - ------------------------------------------------------------------------- -r93 | (no author) | 2006-01-14 14:12:52 -0800 (Sat, 14 Jan 2006) | 4 lines - -typedef'd IntList from TQValueList<int> so IntList() -can be used as intializer for defaults; removed C++ -for second ctors ItemInt64 and ItemUInt64 - ------------------------------------------------------------------------- -r92 | (no author) | 2006-01-14 14:03:35 -0800 (Sat, 14 Jan 2006) | 2 lines - -reversed tdecore/tdeconfigskeleton change - ------------------------------------------------------------------------- -r91 | (no author) | 2006-01-14 13:40:37 -0800 (Sat, 14 Jan 2006) | 2 lines - -remove erroneous files - ------------------------------------------------------------------------- -r90 | (no author) | 2006-01-14 13:38:39 -0800 (Sat, 14 Jan 2006) | 5 lines - -Fix sio syntax errors in tdecore/tdeconfigskeleton.sip -(TQValueList<int>() as arg default value) and -tdeio/slaveinterface.sip (%TypeHeaderCode in namespace -instead of %ModuleHeaderCode outside) - ------------------------------------------------------------------------- -r89 | (no author) | 2006-01-14 13:25:39 -0800 (Sat, 14 Jan 2006) | 5 lines - -Upgrade to sip snapshot (future sip 4.4 - sipTransferObj stuff -and eliminate most typedefs to prevent auto mapped types); add -patch code to TDEConfigSkeleton addItem* and Item* ctors for -scalar types;minor bugfixes (sipForceConvertToTQString anachronisms) - ------------------------------------------------------------------------- -r88 | (no author) | 2005-12-18 11:20:55 -0800 (Sun, 18 Dec 2005) | 2 lines - -Version dirSize in kdirsize.sip for older KDE - ------------------------------------------------------------------------- -r87 | (no author) | 2005-12-18 09:51:33 -0800 (Sun, 18 Dec 2005) | 4 lines - -Fixed versioning bug for enum Other in tdeshortcutlist.sip; -added fully-qualified names to two 'Other' arguments in -method calls - ------------------------------------------------------------------------- -r86 | (no author) | 2005-12-17 14:44:01 -0800 (Sat, 17 Dec 2005) | 3 lines - -Removed incorrect (later version) %Includes from -sip.in files - ------------------------------------------------------------------------- -r85 | (no author) | 2005-12-17 14:24:58 -0800 (Sat, 17 Dec 2005) | 2 lines - -Added missing @mark@ to sip.in files - ------------------------------------------------------------------------- -r84 | (no author) | 2005-12-17 13:39:26 -0800 (Sat, 17 Dec 2005) | 3 lines - -Removed longlong/ulonglong from kzip (now in tdecore for -older KDE versions), and versioned TQPtrList<TDEConfigDialogManager> - ------------------------------------------------------------------------- -r83 | (no author) | 2005-12-17 13:28:33 -0800 (Sat, 17 Dec 2005) | 2 lines - -Extended longlong and ulonglong to earlier KDE versions - ------------------------------------------------------------------------- -r82 | (no author) | 2005-10-15 17:40:13 -0700 (Sat, 15 Oct 2005) | 2 lines - -Updated %Timeline for KDE 3.4.1 - ------------------------------------------------------------------------- -r81 | (no author) | 2005-10-15 17:38:51 -0700 (Sat, 15 Oct 2005) | 5 lines - -Create ChangeLog from svn logs -Change PyKDE version to 3.5.0 -Update KDE versions to 3.4.1 - - ------------------------------------------------------------------------- -r80 | (no author) | 2005-10-15 17:23:54 -0700 (Sat, 15 Oct 2005) | 3 lines - -Modified configure.py to detect compiler and -set default concatenation appropriately - ------------------------------------------------------------------------- -r79 | (no author) | 2005-10-15 17:22:13 -0700 (Sat, 15 Oct 2005) | 2 lines - -fixup - ------------------------------------------------------------------------- -r78 | (no author) | 2005-10-13 11:45:39 -0700 (Thu, 13 Oct 2005) | 8 lines - -Replaced sipNewCppToSelf instances with sipBuildResult -Cleaned up sip files for gcc 3.4.x/4.0.x compatibility -Dropped tdesu (undefined symbol problem) -Added -fno-rtti to tdeprint compile -Dropped driver.sip from tdeprint -Updated configure.py to use pyqtconfig.py for TQt environment info -Backed out konsolepart code (undefined symbol problem) - ------------------------------------------------------------------------- -r76 | (no author) | 2005-07-27 23:27:34 -0700 (Wed, 27 Jul 2005) | 2 lines - -update configure.py for konsolePart - ------------------------------------------------------------------------- -r75 | (no author) | 2005-07-27 21:46:51 -0700 (Wed, 27 Jul 2005) | 2 lines - -added ConvertToSubclassCode entry for konsolePart - ------------------------------------------------------------------------- -r74 | (no author) | 2005-07-26 16:58:53 -0700 (Tue, 26 Jul 2005) | 2 lines - -added konsolePart class - ------------------------------------------------------------------------- -r73 | (no author) | 2005-06-28 16:27:53 -0700 (Tue, 28 Jun 2005) | 2 lines - -KDE 3.4.1 upgrade - ------------------------------------------------------------------------- -r72 | (no author) | 2005-06-28 14:58:07 -0700 (Tue, 28 Jun 2005) | 2 lines - -added bool type to DCOP extensions - ------------------------------------------------------------------------- -r71 | (no author) | 2005-06-18 19:16:03 -0700 (Sat, 18 Jun 2005) | 2 lines - -Added explicit link of tdeui for tdespell module - ------------------------------------------------------------------------- -r70 | (no author) | 2005-06-18 17:59:10 -0700 (Sat, 18 Jun 2005) | 2 lines - -Added private dtors to keep sip 4.2 happy - ------------------------------------------------------------------------- -r69 | (no author) | 2005-03-18 16:05:34 -0800 (Fri, 18 Mar 2005) | 3 lines - -fixed cast in KURL::List operator + that was causing problems -for gcc 4 - ------------------------------------------------------------------------- -r68 | (no author) | 2005-03-16 08:50:52 -0800 (Wed, 16 Mar 2005) | 2 lines - -patch for DCOP line breaks - ------------------------------------------------------------------------- -r67 | (no author) | 2005-03-16 08:49:37 -0800 (Wed, 16 Mar 2005) | 2 lines - -Fix typos in previous patch - ------------------------------------------------------------------------- -r66 | (no author) | 2005-03-15 16:07:18 -0800 (Tue, 15 Mar 2005) | 2 lines - -Added ConvertToSubclassCode blocks for tdemdi, tdeutils - ------------------------------------------------------------------------- -r65 | (no author) | 2005-03-10 10:41:57 -0800 (Thu, 10 Mar 2005) | 2 lines - -added kkeyserver.h to extra/kde340 - ------------------------------------------------------------------------- -r64 | (no author) | 2005-03-08 14:14:58 -0800 (Tue, 08 Mar 2005) | 3 lines - -Fixed case problem in configure.py distro check; fixed default -value in KURL::cleanPath - ------------------------------------------------------------------------- -r62 | (no author) | 2005-03-06 21:31:50 -0800 (Sun, 06 Mar 2005) | 2 lines - -fixed emums in templates/annotated - ------------------------------------------------------------------------- -r61 | (no author) | 2005-03-06 21:30:48 -0800 (Sun, 06 Mar 2005) | 2 lines - -fixed enums in examples, templates; fixed TDEIconThemeDir ref - ------------------------------------------------------------------------- -r60 | (no author) | 2005-03-05 00:57:44 -0800 (Sat, 05 Mar 2005) | 2 lines - -added -L option for lib path - ------------------------------------------------------------------------- -r59 | (no author) | 2005-03-05 00:47:24 -0800 (Sat, 05 Mar 2005) | 2 lines - -removed kjs support - ------------------------------------------------------------------------- -r58 | (no author) | 2005-03-05 00:42:59 -0800 (Sat, 05 Mar 2005) | 2 lines - -update extra/kde340 h files - ------------------------------------------------------------------------- -r57 | (no author) | 2005-03-05 00:36:09 -0800 (Sat, 05 Mar 2005) | 2 lines - -update .easibox - extra/kde340 - ------------------------------------------------------------------------- -r56 | (no author) | 2005-03-05 00:34:34 -0800 (Sat, 05 Mar 2005) | 2 lines - -added extra/kde340 - ------------------------------------------------------------------------- -r55 | (no author) | 2005-03-04 23:58:35 -0800 (Fri, 04 Mar 2005) | 2 lines - -tdemdimod.sip.in one more time - ------------------------------------------------------------------------- -r54 | (no author) | 2005-03-04 23:53:37 -0800 (Fri, 04 Mar 2005) | 2 lines - -tdemdimod.sip.in again - ------------------------------------------------------------------------- -r53 | (no author) | 2005-03-04 23:37:43 -0800 (Fri, 04 Mar 2005) | 2 lines - -fixed tdemdimod.sip.in and tdeutils.sip.in - ------------------------------------------------------------------------- -r52 | (no author) | 2005-03-04 23:08:29 -0800 (Fri, 04 Mar 2005) | 2 lines - -correct qt path in tdeutils.sip.in - ------------------------------------------------------------------------- -r51 | (no author) | 2005-03-04 23:04:54 -0800 (Fri, 04 Mar 2005) | 2 lines - -%Include bytearray.sip missing from tdecore.sip.in - ------------------------------------------------------------------------- -r50 | (no author) | 2005-03-04 22:59:10 -0800 (Fri, 04 Mar 2005) | 2 lines - -fixed missing %Feature in dcopmod.sip.in - ------------------------------------------------------------------------- -r49 | (no author) | 2005-03-04 22:55:43 -0800 (Fri, 04 Mar 2005) | 2 lines - -fixed paths in sip.in files - ------------------------------------------------------------------------- -r48 | (no author) | 2005-03-04 22:49:00 -0800 (Fri, 04 Mar 2005) | 2 lines - -doc updates for PyKDE 4.0 - ------------------------------------------------------------------------- -r47 | (no author) | 2005-03-04 22:28:30 -0800 (Fri, 04 Mar 2005) | 2 lines - -PyKDE 4.0 docs - ------------------------------------------------------------------------- -r46 | (no author) | 2005-03-04 22:02:00 -0800 (Fri, 04 Mar 2005) | 2 lines - -new configure.py for PyKDE 4.0 - ------------------------------------------------------------------------- -r45 | (no author) | 2005-03-04 22:00:42 -0800 (Fri, 04 Mar 2005) | 2 lines - -PyKDE 4.0 - ------------------------------------------------------------------------- -r42 | (no author) | 2005-03-01 16:20:01 -0800 (Tue, 01 Mar 2005) | 2 lines - -Fixed TDEActionCollection for Mandrake - ------------------------------------------------------------------------- -r41 | (no author) | 2005-03-01 14:55:49 -0800 (Tue, 01 Mar 2005) | 2 lines - -Fixed pid_t typing problems (TQValueList) - ------------------------------------------------------------------------- -r40 | (no author) | 2005-03-01 13:34:04 -0800 (Tue, 01 Mar 2005) | 2 lines - -Changed pid_t type from int to long; enabled KParts::URLArgs::metaData () - ------------------------------------------------------------------------- -r39 | (no author) | 2005-02-28 23:49:09 -0800 (Mon, 28 Feb 2005) | 4 lines - -KFileMetaInfo typedefs removed; TDEProcessController versioning -corrected; TDERecentDirs (and extra/ hfiles) added; pytde332.prj -added - ------------------------------------------------------------------------- -r38 | (no author) | 2005-02-28 22:34:42 -0800 (Mon, 28 Feb 2005) | 2 lines - -added TDEHTMLPart to %ConvertToSubclassCode; install kdepyuic - ------------------------------------------------------------------------- -r37 | (no author) | 2005-02-03 00:07:38 -0800 (Thu, 03 Feb 2005) | 2 lines - -Added KURL import to dcopext.py - ------------------------------------------------------------------------- -r36 | (no author) | 2005-01-04 11:38:01 -0800 (Tue, 04 Jan 2005) | 2 lines - -Add extra subdir - ------------------------------------------------------------------------- -r35 | (no author) | 2005-01-03 21:38:17 -0800 (Mon, 03 Jan 2005) | 2 lines - -KDE 3.3.2 and sip 4.2 updates - ------------------------------------------------------------------------- -r33 | (no author) | 2004-11-28 13:58:07 -0800 (Sun, 28 Nov 2004) | 2 lines - -Modified tdemdidefines.sip for sip 4.2 enumerator name problem - ------------------------------------------------------------------------- -r32 | (no author) | 2004-11-28 13:56:19 -0800 (Sun, 28 Nov 2004) | 2 lines - -Removed pytdeconfig.py from source control - ------------------------------------------------------------------------- -r31 | (no author) | 2004-11-27 23:29:03 -0800 (Sat, 27 Nov 2004) | 2 lines - -docs - ------------------------------------------------------------------------- -r30 | (no author) | 2004-11-27 23:07:07 -0800 (Sat, 27 Nov 2004) | 2 lines - -docs - ------------------------------------------------------------------------- -r29 | (no author) | 2004-11-27 22:17:49 -0800 (Sat, 27 Nov 2004) | 2 lines - -Missing comma - ------------------------------------------------------------------------- -r28 | (no author) | 2004-11-27 22:16:34 -0800 (Sat, 27 Nov 2004) | 2 lines - -PyKDE for KDE 3.3.1 - ------------------------------------------------------------------------- -r27 | (no author) | 2004-11-27 21:16:55 -0800 (Sat, 27 Nov 2004) | 2 lines - -Revise project files - ------------------------------------------------------------------------- -r26 | (no author) | 2004-11-27 17:47:35 -0800 (Sat, 27 Nov 2004) | 2 lines - -Updating to KDE 3.3.1 - ------------------------------------------------------------------------- -r25 | (no author) | 2004-08-25 16:43:40 -0700 (Wed, 25 Aug 2004) | 2 lines - -Updated change log - ------------------------------------------------------------------------- -r24 | (no author) | 2004-08-25 16:41:33 -0700 (Wed, 25 Aug 2004) | 2 lines - -Updated numbering to 3.11.3 - ------------------------------------------------------------------------- -r23 | (no author) | 2004-08-25 15:34:33 -0700 (Wed, 25 Aug 2004) | 2 lines - -Added post proc for WId in twinmodule signals - ------------------------------------------------------------------------- -r22 | (no author) | 2004-08-21 16:50:33 -0700 (Sat, 21 Aug 2004) | 2 lines - -same tdehtml_part patch as the previous rev ??? - ------------------------------------------------------------------------- -r21 | (no author) | 2004-08-21 16:42:06 -0700 (Sat, 21 Aug 2004) | 2 lines - -tdehtml_part: fixed enum values for sip3.10.2 with KDE 3.3.0 - ------------------------------------------------------------------------- -r20 | (no author) | 2004-08-21 01:10:05 -0700 (Sat, 21 Aug 2004) | 2 lines - -Update version numbers in docs - ------------------------------------------------------------------------- -r19 | (no author) | 2004-08-21 01:03:27 -0700 (Sat, 21 Aug 2004) | 2 lines - -docs for final release - ------------------------------------------------------------------------- -r18 | (no author) | 2004-08-20 18:50:22 -0700 (Fri, 20 Aug 2004) | 2 lines - -Fixed access specifier for copy ctor on TDEProcessController - ------------------------------------------------------------------------- -r17 | (no author) | 2004-08-20 10:00:27 -0700 (Fri, 20 Aug 2004) | 2 lines - -Updated to KDE 3.3.0 final - ------------------------------------------------------------------------- -r16 | (no author) | 2004-08-20 09:59:28 -0700 (Fri, 20 Aug 2004) | 2 lines - -Removed tdehtml_part.sip (different versions for different KDE versions) - ------------------------------------------------------------------------- -r15 | (no author) | 2004-08-19 23:52:31 -0700 (Thu, 19 Aug 2004) | 2 lines - -Added svnmerge, svnmergedocs - ------------------------------------------------------------------------- -r14 | (no author) | 2004-08-16 19:42:57 -0700 (Mon, 16 Aug 2004) | 2 lines - -change spaces to tabs in postproc/appQuit - ------------------------------------------------------------------------- -r13 | (no author) | 2004-08-16 19:41:25 -0700 (Mon, 16 Aug 2004) | 2 lines - -Save doc tool mods - ------------------------------------------------------------------------- -r12 | (no author) | 2004-08-16 17:44:37 -0700 (Mon, 16 Aug 2004) | 2 lines - -Updated docs - ------------------------------------------------------------------------- -r11 | (no author) | 2004-08-16 17:23:33 -0700 (Mon, 16 Aug 2004) | 2 lines - -Patched qvariant.h problem in tdecore - ------------------------------------------------------------------------- -r10 | (no author) | 2004-08-16 16:40:43 -0700 (Mon, 16 Aug 2004) | 2 lines - -Corrected kuniqueapplication - ------------------------------------------------------------------------- -r9 | (no author) | 2004-08-16 14:43:51 -0700 (Mon, 16 Aug 2004) | 2 lines - -Fixed h file problems for KDE3.0.x; fixed LONG_LONG for KDE3.0.x with Python 2.3 - ------------------------------------------------------------------------- -r8 | (no author) | 2004-08-15 21:49:27 -0700 (Sun, 15 Aug 2004) | 2 lines - -version before access hides access for KDE < 3.2 in kprocctrl.sip - ------------------------------------------------------------------------- -r7 | (no author) | 2004-08-15 12:21:23 -0700 (Sun, 15 Aug 2004) | 2 lines - -Corrected error - configure.py spippath defined in wrong place - ------------------------------------------------------------------------- -r6 | (no author) | 2004-08-15 12:19:37 -0700 (Sun, 15 Aug 2004) | 2 lines - -Added tdehtml_part.sip versions - ------------------------------------------------------------------------- -r5 | (no author) | 2004-08-15 12:14:27 -0700 (Sun, 15 Aug 2004) | 3 lines - -Changes to configure.py for tdehtml/tdeutils when KDE < 3.3.0 and -tdeutils isn't needed/supported - ------------------------------------------------------------------------- -r4 | (no author) | 2004-08-15 12:04:57 -0700 (Sun, 15 Aug 2004) | 2 lines - -Patches for building with -i option (no concatenation) - ------------------------------------------------------------------------- -r3 | (no author) | 2004-08-15 09:13:47 -0700 (Sun, 15 Aug 2004) | 2 lines - -Ready for KDE 3.3.0beta2 - ------------------------------------------------------------------------- -r2 | (no author) | 2004-08-13 22:35:48 -0700 (Fri, 13 Aug 2004) | 2 lines - -Initial import - ------------------------------------------------------------------------- diff --git a/configure.py b/configure.py index fde3a4d..9ee62de 100644 --- a/configure.py +++ b/configure.py @@ -167,10 +167,10 @@ def check_gcc (): os.system ("gcc -dumpversion > gccvers.txt") m = open ('gccvers.txt', 'r') - vers = m.read ().strip () + vers = m.read().strip() m.close () os.unlink ('gccvers.txt') - print "gcc version %s" % vers + print("gcc version %s" % vers) if opt_concat == None: if vers < "4.0.0" or vers >= "4.0.3": @@ -179,10 +179,10 @@ def check_gcc (): opt_concat = 0 if opt_concat == 1: - print "concatenating files" + print("concatenating files") else: - print "no concatenation" - print + print("no concatenation") + print() def init_and_check_sanity (): """ Do some initialization and check various versions and @@ -225,25 +225,25 @@ def usage(rcode = 2): rcode is the return code passed back to the calling process. """ - print "Usage:" - print " python configure.py [-h] [-c] [-d dir] [-g] [-j #] [-k] [-n dir] [-o dir] [-r] [-u] [-v dir] [-z file]" - print "where:" - print " -h displays this help message" - print " -c concatenates each module's C/C++ source files [default]" - print " -d dir where the PyKDE modules will be installed [default %s]" % opt_pytdemoddir - print " -e lib explicitly specify the python library" - print " -g always release the GIL (SIP-TQt v3.x behaviour)" - print " -i no concatenation of each module's C/C++ source files" - print " -j # splits the concatenated C++ source files into # pieces [default 1]" - print " -k dir the KDE base directory" - print " -L dir the library directory name [default lib]" - print " -n dir the directory containing the KDE lib files" - print " -o dir the directory containing the KDE header files" - print " -r generates code with tracing enabled [default disabled]" - print " -u build with debugging symbols" - print " -v dir where the PyKDE .sip files will be installed [default %s]" % opt_pytdesipdir - print " -w turn on KDE deprecated object warnings when compiling [default off]" - print " -z file the name of a file containing command line flags" + print("Usage:") + print(" python configure.py [-h] [-c] [-d dir] [-g] [-j #] [-k] [-n dir] [-o dir] [-r] [-u] [-v dir] [-z file]") + print("where:") + print(" -h displays this help message") + print(" -c concatenates each module's C/C++ source files [default]") + print(" -d dir where the PyKDE modules will be installed [default %s]" % opt_pytdemoddir) + print(" -e lib explicitly specify the python library") + print(" -g always release the GIL (SIP-TQt v3.x behaviour)") + print(" -i no concatenation of each module's C/C++ source files") + print(" -j # splits the concatenated C++ source files into # pieces [default 1]") + print(" -k dir the KDE base directory") + print(" -L dir the library directory name [default lib]") + print(" -n dir the directory containing the KDE lib files") + print(" -o dir the directory containing the KDE header files") + print(" -r generates code with tracing enabled [default disabled]") + print(" -u build with debugging symbols") + print(" -v dir where the PyKDE .sip files will be installed [default %s]" % opt_pytdesipdir) + print(" -w turn on KDE deprecated object warnings when compiling [default off]") + print(" -z file the name of a file containing command line flags") sys.exit(rcode) @@ -252,23 +252,23 @@ def inform_user(stage): """Tell the user the option values that are going to be used. """ if stage == 0: - print - print " PyKDE version %s" % pytde_version_str - print " -------" - print + print() + print(" PyKDE version %s" % pytde_version_str) + print(" -------") + print() sip_tqt_config.inform ("Python include directory is %s" % sipcfg.py_inc_dir) sip_tqt_config.inform ("Python version is %s" % sip_tqt_config.version_to_string (sipcfg.py_version)) - print + print() sip_tqt_config.inform ("sip-tqt version is %s (%s)" % (sipcfg.sip_version_str, sip_tqt_config.version_to_string (sipcfg.sip_version))) - print + print() sip_tqt_config.inform ("TQt directory is %s" % pyqtcfg.qt_dir) sip_tqt_config.inform ("TQt version is %s" % sip_tqt_config.version_to_string (pyqtcfg.qt_version)) - print + print() sip_tqt_config.inform ("PyTQt directory is %s" % pyqtcfg.pyqt_sip_dir) sip_tqt_config.inform ("PyTQt version is %s (%s)" % (pyqtcfg.pyqt_version_str, sip_tqt_config.version_to_string (pyqtcfg.pyqt_version))) - print + print() elif stage == 1: sip_tqt_config.inform ("KDE base directory is %s" % opt_tdebasedir) @@ -278,11 +278,11 @@ def inform_user(stage): elif stage == 2: sip_tqt_config.inform ("KDE version is %s (0x%x)" % (kde_version_str, kde_version)) - print + print() sip_tqt_config.inform("PyKDE modules will be installed in %s" % opt_pytdemoddir) sip_tqt_config.inform("PyKDE .sip files will be installed in %s" % opt_pytdesipdir) - print + print() @@ -332,16 +332,16 @@ def getKDEVersion (versFile): ok = 0 while not ok and l: - wl = string.split(l) + wl = l.split() if len(wl) == 3 and wl[0] == "#define": if wl[1] == "TDE_VERSION_MAJOR": - major = string.strip (wl[2]) + major = wl[2].strip() if wl[1] == "TDE_VERSION_MINOR": - minor = string.strip (wl[2]) + minor = wl[2].strip() if wl[1] == "TDE_VERSION_RELEASE": - micro = string.strip (wl[2]) + micro = wl[2].strip() if major and minor and micro: ok = 1 @@ -357,18 +357,18 @@ def getKDEVersion (versFile): kde_version = (int (major) << 16) + (int (minor) << 8) + int (micro) if kde_version > kde_max_version: - print + print() sip_tqt_config.inform ("*** True KDE version is %s -- building for KDE %s ***" % (hex (kde_version), hex (kde_max_version))) - print + print() kde_version = kde_max_version major = hex ((kde_version & 0xff0000) >> 16) [ 2:] minor = hex ((kde_version & 0x00ff00) >> 8) [ 2:] micro = hex (kde_version & 0x0000ff) [ 2:] if ok: - kde_version_str = string.join ([major, minor, micro], ".") - kde_version_sfx = string.join (["-kde", major, minor, micro, ".diff"], "") - kde_version_extra = string.join (["kde", major, minor, micro], "") + kde_version_str = ".".join([major, minor, micro]) + kde_version_sfx = "".join(["-kde", major, minor, micro, ".diff"]) + kde_version_extra = "".join(["kde", major, minor, micro]) else: sip_tqt_config.error ("KDE version not found in %s" % versFile) @@ -454,9 +454,9 @@ def create_top_level (mname): d = open (diff) line = d.readline() while line: - if string.find (line, "+") == 0: + if line.find ("+") == 0: plus.append (line [2:]) - elif string.find (line, "-") == 0: + elif line.find ("-") == 0: minus.append (line [2:]) line = d.readline() @@ -466,16 +466,16 @@ def create_top_level (mname): line = sipin.readline() while line: - if string.find (line, "%Include") == 0: + if line.find("%Include") == 0: inclFound = 1 if minus and line in minus: line = sipin.readline() continue sipout.write (line) - elif string.find (line, "@mark@") == 0: + elif line.find ("@mark@") == 0: for p in plus: sipout.write (p) - elif mname == "tdeabc" and kde_version < 0x030200 and string.find (line, "tderesourcesmod.sip") >= 0: + elif mname == "tdeabc" and kde_version < 0x030200 and line.find("tderesourcesmod.sip") >= 0: pass else: sipout.write (line) @@ -629,20 +629,19 @@ def generate_code(mname, imports=None, extra_cflags=None, extra_cxxflags=None, e argv.append (pyqtcfg.pyqt_sip_dir) pyqtInclPathSeen = 1 - elif mod == "dcop" or string.find (mod, "k") == 0 or string.find (mod, "tde") == 0: + elif mod == "dcop" or mod.find("k") == 0 or mod.find("tde") == 0: subdir = os.path.join(srcPath("sip"), mod) argv.append("-I") argv.append(subdir) # SIP-TQt assumes POSIX style path separators. - argv.append(srcPath(string.join(["sip", mname, mname + "mod.sip"], "/"))) + argv.append(srcPath("/".join(["sip", mname, mname + "mod.sip"]))) -# print string.join (argv) # finally, run SIP-TQt and generate the C++ code - os.system (string.join(argv)) + os.system (" ".join(argv)) # post process the C++ code for TQT_NO_TRANSLATION - if os.system (string.join ([sys.executable, srcPath("postproc")] + ['-p', mname, "-o", "tr", "*.cpp"])) != 0: + if os.system (" ".join ([sys.executable, srcPath("postproc")] + ['-p', mname, "-o", "tr", "*.cpp"])) != 0: sip_tqt_config.error ("Post processing of C++ code failed %s (tr)" % mname) # Check the result. @@ -662,7 +661,7 @@ def generate_code(mname, imports=None, extra_cflags=None, extra_cxxflags=None, e # needs to be here (not earlier) to catch .py files if any if postProcess [mname]: for s in postProcess [mname]: - if os.system (string.join ([sys.executable, srcPath("postproc")] + s)) != 0: + if os.system (" ".join ([sys.executable, srcPath("postproc")] + s)) != 0: sip_tqt_config.error ("Post processing of C++ code failed %s (%s)" % (mname, s [3])) # Generate the Makefile. @@ -777,7 +776,7 @@ def generate_code(mname, imports=None, extra_cflags=None, extra_cxxflags=None, e makefile.extra_libs.insert(0, makefile.module_as_lib(im)) makefile.generate() - print + print() def create_makefiles(): @@ -806,14 +805,14 @@ def fileOpts (fn): if (line [0] == '#') or (line == '\n'): continue elif line [0] == '-': - opts.append ((line [0:2], string.strip (line [2:]))) + opts.append ((line [0:2], line[2:].strip())) else: - opts.append (("-" + line [0:1], string.strip (line [1:]))) + opts.append (("-" + line [0:1], line[1:].strip())) - print 'Additional options: ', + print('Additional options: ', end=' ') for opt, arg in opts: - print "%s %s " %(opt, arg) - print + print("%s %s " %(opt, arg)) + print() return opts @@ -928,7 +927,7 @@ def main(argv): except: sip_tqt_config.error ("%s is not a PyKDE module" % opt_startModName) - print "PyKDE modules to be built:\n %s\n" % string.join(pytde_modules [opt_startmod:opt_endmod]) + print("PyKDE modules to be built:\n %s\n" % " ".join(pytde_modules[opt_startmod:opt_endmod])) set_sip_flags() @@ -946,7 +945,7 @@ def main(argv): def reporting_msg (): - print """ + print(""" If reporting errors, paste all of the output above into your message and post to the PyKDE mailing list at: @@ -954,7 +953,7 @@ message and post to the PyKDE mailing list at: subscribe: http://mats.imk.fraunhofer.de/mailman/listinfo/pytde You can redirect the output into a file (> output.txt) if needed -""" +""") @@ -970,9 +969,8 @@ if __name__ == "__main__": raise except: reporting_msg () - print \ -""" + print(""" An internal error occured. Please report all output from the program, including the following traceback, to the PyKDE mailing list -""" +""") raise diff --git a/examples/README b/examples/README index a316a6a..8251cb6 100644 --- a/examples/README +++ b/examples/README @@ -1,6 +1,6 @@ This subdirectory contains a few executable Python programs that demonstrate or test some features of -PyKDE: +PyTDE: uisampler.py - demos of most of the tdeui widgets, including dialogs, menus (TDEAction, KStdAction, etc) diff --git a/examples/example_dcopexport.py b/examples/example_dcopexport.py index 7d4ae95..d9436fc 100644 --- a/examples/example_dcopexport.py +++ b/examples/example_dcopexport.py @@ -30,13 +30,13 @@ copyright holder. """ # This is an example of a DCOP enabled application written in Python, using -# PyKDE and the dcopexport module. Taken from server.py example in kde-bindings +# PyTDE and the dcopexport module. Taken from server.py example in kde-bindings # which was written by Torben Weis and Julian Rockey import sys +from PyTQt.qt import TQString, TQStringList from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData from dcopexport import DCOPExObj -from PyTQt.qt import TQString, TQStringList """ DCOPExObj provides all of the necessary machinery to DCOP-enable @@ -67,8 +67,8 @@ To DCOP-enable an app, # the class which will expose methods to DCOP - the methods do NOT # need to be a member of this class. class DeadParrotObject (DCOPExObj): - def __init__ (self, id = 'dead parrot'): - DCOPExObj.__init__ (self, id) + def __init__ (self, id = b'dead parrot'): + DCOPExObj.__init__(self, id) # the methods available from this app via DCOP # addMethod (<signature>, <Python method>) @@ -100,28 +100,28 @@ class DeadParrotObject (DCOPExObj): return qadjList -description = "A basic application template" -version = "1.0" -aboutData = TDEAboutData ("testdcopexport", "petshop",\ + +description = b"DCOP server template" +version = b"1.0" +aboutData = TDEAboutData (b"MyApp", b"MyApp",\ version, description, TDEAboutData.License_GPL,\ - "(C) 2003 whoever the author is") + b"(C) 2003 whoever the author is") -aboutData.addAuthor ("author1", "whatever they did", "email@somedomain") -aboutData.addAuthor ("author2", "they did something else", "[email protected]") +aboutData.addAuthor (b"author1", b"whatever they did", b"email@somedomain") +aboutData.addAuthor (b"author2", b"they did something else", b"[email protected]") TDECmdLineArgs.init (sys.argv, aboutData) - -TDECmdLineArgs.addCmdLineOptions ([("+files", "File to open")]) +TDECmdLineArgs.addCmdLineOptions ([(b"+files", b"File to open")]) app = TDEApplication () dcop = app.dcopClient () -appid = dcop.registerAs('petshop') -print "DCOP Application: %s starting" % appid +appid = dcop.registerAs(b'petshop') +print("DCOP Application: %s starting" % appid.data()) parrot = DeadParrotObject() -another_parrot = DeadParrotObject('polly') +another_parrot = DeadParrotObject(b'polly') -print """ +print(""" Run kdcop and look for the 'petshop' application instance. This program exports the 'deadParrot' and 'polly' objects. @@ -129,7 +129,7 @@ Double-clicking those object's methods will allow you to get or set data. To end the application, in kdcop choose the MainApplication-Interface object and double-click the quit() method. -""" +""") app.exec_loop() diff --git a/examples/example_dcopext.py b/examples/example_dcopext.py index 31815c5..d019780 100644 --- a/examples/example_dcopext.py +++ b/examples/example_dcopext.py @@ -28,108 +28,105 @@ copyright holder. """ import sys, time +from PyTQt.qt import TQString, TQCString import dcop import dcopext from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData -from PyTQt.qt import TQString, TQCString - def getAnyApplication (client, appName): for qcstring_app in client.registeredApplications (): app = str (qcstring_app) if app == appName or app.startswith (appName + "-"): - print app - print + print(app) + print() objList, ok = client.remoteObjects (app) for obj in objList: - print " ", obj + print(" ", obj) funcs, ok = client.remoteFunctions (app, obj) for f in funcs: - print " ", " ", f + print(" ", " ", f) break #-------------------- main ------------------------------------------------ -description = "A basic application template" -version = "1.0" -aboutData = TDEAboutData ("testdcopext", "testdcopext",\ +description = b"DCOP client template" +version = b"1.0" +aboutData = TDEAboutData (b"MyApp", b"MyApp",\ version, description, TDEAboutData.License_GPL,\ - "(C) 2003 whoever the author is") + b"(C) 2003 whoever the author is") -aboutData.addAuthor ("author1", "whatever they did", "email@somedomain") -aboutData.addAuthor ("author2", "they did something else", "[email protected]") +aboutData.addAuthor (b"author1", b"whatever they did", b"email@somedomain") +aboutData.addAuthor (b"author2", b"they did something else", b"[email protected]") TDECmdLineArgs.init (sys.argv, aboutData) -TDECmdLineArgs.addCmdLineOptions ([("+files", "File to open")]) +TDECmdLineArgs.addCmdLineOptions ([(b"+files", b"File to open")]) app = TDEApplication () dcop = app.dcopClient () #getAnyApplication (dcop, "konqueror") -print "--------------------------" -print "The DCOPObjects for kicker:" +print("--------------------------") +print("The DCOPObjects for kicker:") d = dcopext.DCOPApp ("kicker", dcop) objs = d.objects if objs: for obj in objs: - print obj + print(obj.data()) +print("--------------------------") +print("The methods for the panel:") o = d.object ("Panel") methods = o.methods for method in methods: - print method + print(method.data()) m = o.method ("addNonKDEAppButton") - -print "--------------------------" -print "The method" -print o.method -print "--------------------------" -print "Find the method:" -print m.findMethod () -print "--------------------------" -print "The return type:" -print m.rtype -print "--------------------------" -print "The argument types:" -print m.argtypes -print "--------------------------" -print "The argument names:" -print m.argnames -print "--------------------------" - -print -print "get kicker panel size via DCOP" +print(m) +print("--------------------------") +print("The method") +print(o.method) +print("--------------------------") +print("Find the method:") +print(m.findMethod ()) +print("--------------------------") +print("The return type:") +print(m.rtype) +print("--------------------------") +print("The argument types:") +print(m.argtypes) +print("--------------------------") +print("The argument names:") +print(m.argnames) +print("--------------------------") + +print("get kicker panel size via DCOP") res = d.Panel.panelSize() -print res, d.Panel.panelSize.valid -print "--------------------------" +print(res, d.Panel.panelSize.valid) +print("--------------------------") -print "Call a method that doesn't exist" +print("Call a method that doesn't exist") res = d.Panel.junk () -print res -print "--------------------------" +print(res) +print("--------------------------") -print "See if a non-existent method is valid" -print d.Panel.junk.valid -print -print "--------------------------" +print("See if a non-existent method is valid") +print(d.Panel.junk.valid) +print("--------------------------") -print -print -print "Start a kwrite instance" +print("Start a kwrite instance") errcode, error, dcopService, pid = TDEApplication.startServiceByDesktopName ("kwrite", "") dcopService = "kwrite-" + str (pid) -print "errcode: %i error: %s dcopService: %s pid: %i" % (errcode, error, dcopService, pid) -print "--------------------------" +print("errcode: %i error: %s dcopService: %s pid: %i" % (errcode, error, dcopService, pid)) +print("--------------------------") time.sleep (2) o1 = dcopext.DCOPObj (dcopService, dcop, "EditInterface#1") -print "Check if insertLine is a valid function" -print "valid", o1.insertLine.valid -print "--------------------------" -print "insertLine's arg types and names" -print o1.insertLine.argtypes, o1.insertLine.argnames -print "--------------------------" -print "Insert a line into the kwrite instance we launched" -print "call returns:", o1.insertLine (0, "Now is the time for all good men to come to the aid of their party") +print("Check if insertLine is a valid function") +print("valid", o1.insertLine.valid) +print("--------------------------") +print("insertLine's arg types and names") +print(o1.insertLine.argtypes, o1.insertLine.argnames) +print("--------------------------") +print("Insert a line into the kwrite instance we launched") +print("call returns:", o1.insertLine (0, "Now is the time for all good men to come to the aid of their party")) diff --git a/examples/kurldemo.py b/examples/kurldemo.py index badec04..cddb9a4 100644 --- a/examples/kurldemo.py +++ b/examples/kurldemo.py @@ -36,7 +36,7 @@ from tdeui import TDEMainWindow, KEdit class MainWin (TDEMainWindow): def __init__ (self, *args): - apply (TDEMainWindow.__init__, (self,) + args) + TDEMainWindow.__init__(self, *args) self.setGeometry (0, 0, 400, 600) @@ -79,18 +79,18 @@ class MainWin (TDEMainWindow): #-------------------- main ------------------------------------------------ -description = "A basic application template" -version = "1.0" -aboutData = TDEAboutData ("", "",\ +description = b"A basic application template" +version = b"1.0" +aboutData = TDEAboutData (b"MyApp", b"MyApp",\ version, description, TDEAboutData.License_GPL,\ - "(C) 2003 whoever the author is") + b"(C) 2003 whoever the author is") -aboutData.addAuthor ("author1", "whatever they did", "email@somedomain") -aboutData.addAuthor ("author2", "they did something else", "[email protected]") +aboutData.addAuthor (b"author1", b"whatever they did", b"email@somedomain") +aboutData.addAuthor (b"author2", b"they did something else", b"[email protected]") TDECmdLineArgs.init (sys.argv, aboutData) -TDECmdLineArgs.addCmdLineOptions ([("+files", "File to open")]) +TDECmdLineArgs.addCmdLineOptions ([(b"+files", b"File to open")]) app = TDEApplication () mainWindow = MainWin (None, "main window") diff --git a/examples/menudemo.py b/examples/menudemo.py index 460be70..33960a2 100644 --- a/examples/menudemo.py +++ b/examples/menudemo.py @@ -1,6 +1,6 @@ """ This template constructs an application with menus, toolbar and statusbar. -It uses KDE classes and methods that simplify the task of building and +It uses TDE classes and methods that simplify the task of building and operating a GUI. It is recommended that this approach be used, rather than the primitive approach in menuapp1.py """ @@ -35,10 +35,6 @@ copyright holder. """ -False = 0 -True = not False - - import sys from PyTQt.qt import TQPopupMenu, SIGNAL, TQLabel, TQIconSet @@ -53,7 +49,7 @@ STATUSBAR_RIGHT = 3 class MainWin (TDEMainWindow): def __init__ (self, *args): - apply (TDEMainWindow.__init__, (self,) + args) + TDEMainWindow.__init__(self, *args) self.initActions () self.initMenus () @@ -106,14 +102,6 @@ class MainWin (TDEMainWindow): self.actionMenu.insert (KStdAction.zoomIn (self.slotZoomIn, self.actionCollection ())) self.actionMenu.insert (KStdAction.zoomOut (self.slotZoomOut, self.actionCollection ())) - # Doesn't work in KDE 2.1.1 -# self.radio1Action = TDERadioAction ("Radio 1") -# self.radio1Action.setExclusiveGroup ("Radio") -# self.radio2Action = TDERadioAction ("Radio 2") -# self.radio2Action.setExclusiveGroup ("Radio") -# self.radio3Action = TDERadioAction ("Radio 3") -# self.radio3Action.setExclusiveGroup ("Radio") - def initMenus (self): fileMenu = TQPopupMenu (self) self.newAction.plug (fileMenu) @@ -272,20 +260,21 @@ class MainWin (TDEMainWindow): #-------------------- main ------------------------------------------------ -description = "A basic application template" -version = "1.0" -aboutData = TDEAboutData ("", "",\ +description = b"A basic application template" +version = b"1.0" +aboutData = TDEAboutData (b"MyApp", b"MyApp",\ version, description, TDEAboutData.License_GPL,\ - "(C) 2003 whoever the author is") + b"(C) 2003 whoever the author is") -aboutData.addAuthor ("author1", "whatever they did", "email@somedomain") -aboutData.addAuthor ("author2", "they did something else", "[email protected]") +aboutData.addAuthor (b"author1", b"whatever they did", b"email@somedomain") +aboutData.addAuthor (b"author2", b"they did something else", b"[email protected]") TDECmdLineArgs.init (sys.argv, aboutData) -TDECmdLineArgs.addCmdLineOptions ([("+files", "File to open")]) +TDECmdLineArgs.addCmdLineOptions ([(b"+files", b"File to open")]) app = TDEApplication () -mainWindow = MainWin (None, "main window") +mainWindow = MainWin (None, b"main window") +mainWindow.setGeometry(100, 100, 600, 400) mainWindow.show() app.exec_loop() diff --git a/examples/mimetype.py b/examples/mimetype.py index 044bc7a..26fbe7f 100644 --- a/examples/mimetype.py +++ b/examples/mimetype.py @@ -4,8 +4,6 @@ methods (KMimeType, KService, etc). It generally tests the *::List methods for these classes (eg KService::List) since that also tests the *::Ptr mapped type code (eg KService::Ptr) at the same time. -This version is suitable for KDE >= 3.0.0 (some methods not available -in earlier versions) """ """ @@ -47,7 +45,7 @@ from tdeio import KMimeType, KService, KServiceGroup, KServiceType, TDETrader, K class MainWin (TDEMainWindow): def __init__ (self, *args): - apply (TDEMainWindow.__init__, (self,) + args) + TDEMainWindow.__init__(*(self,) + args) tabctl = KTabCtl (self) self.setGeometry (0, 0, 600, 400) @@ -88,7 +86,7 @@ class OfferListTab (TQWidget): trader = TDETrader.self () slist = trader.query ("image/jpeg", "Type == 'Application'") - print "TDETrader returned:", slist + print("TDETrader returned:", slist) for s in slist: lvi = TQListViewItem (lv, s.type_ (), s.name (), s.exec_ (), s.library ()) @@ -253,16 +251,16 @@ class KMimeTypeTab (TQWidget): #-------------------- main ------------------------------------------------ -description = "Test/demo TDESharedPtr related methods/classes" -version = "1.0" -aboutData = TDEAboutData ("", "",\ + +description = b"Test/demo TDESharedPtr related methods/classes" +version = b"1.0" +aboutData = TDEAboutData (b"MyApp", b"MyApp",\ version, description, TDEAboutData.License_GPL,\ - "(C) 2003 Jim Bublitz") + b"(C) 2003 Jim Bublitz") TDECmdLineArgs.init (sys.argv, aboutData) -TDECmdLineArgs.addCmdLineOptions ([("+files", "File to open")]) - +TDECmdLineArgs.addCmdLineOptions ([(b"+files", b"File to open")]) app = TDEApplication () mainWindow = MainWin (None, "main window") mainWindow.show() diff --git a/examples/pyTDEHTMLPart.py b/examples/pyTDEHTMLPart.py index fc3f934..333247d 100644 --- a/examples/pyTDEHTMLPart.py +++ b/examples/pyTDEHTMLPart.py @@ -8,7 +8,7 @@ This is an extemely simple and crude example of using a TDEHTMLPart - I put it together mostly to make sure the openURL method worked correctly after some modifications done in KParts::ReadOnlyPart. It took exactly four lines -added to a basic PyKDE app framework to display a URL +added to a basic PyTDE app framework to display a URL via the 'net: self.w = TDEHTMLPart (self, "HTMLPart", self); @@ -26,31 +26,27 @@ probably need to connect some signals to slots. I haven't tried it, but this should work with a plain TDEMainWindow or other widget too. -The KDE website also incorporates gifs, jpegs, and +The TDE website also incorporates gifs, jpegs, and I believe CSS too. Playing around with some other sites, it appears the font defaults could use some improvement. NOTE!!! For this to work, you (obviously) need to have a route to the internet established or specify a local -URL - PyKDE/KDE will take care of everything else. +URL - PyTDE/TDE will take care of everything else. Perceptive users will notice the TDEHTMLPart code is -lifted from the KDE classref. +lifted from the TDE classref. """ # If you import more classes, don't forget to add them here (some of these # are extras/not used) +from PyTQt.qt import TQString, TQStringList from tdecore import TDECmdLineArgs, KURL, TDEApplication, i18n, TDEAboutData, BarIcon, KLibLoader - from tdeui import TDEMainWindow, KMessageBox, TDEAction, KStdAction, KKeyDialog, KEditToolbar - -from PyTQt.qt import TQString, TQStringList - from tdeio import TDETrader - from tdehtml import TDEHTMLPart, TDEHTMLView # Importing the KParts namespace gets us all of the KParts:: classes @@ -58,20 +54,14 @@ from tdeparts import KParts, createReadOnlyPart, createReadWritePart import sys, os -FALSE = 0 -TRUE = not FALSE - TOOLBAR_EXIT = 0 TOOLBAR_OPEN = 1 # Note that we use KParts.MainWindow, not TDEMainWindow as the superclass -# (KParts.MainWindow subclasses TDEMainWindow). Also, be sure the 'apply' -# clause references KParts.MainWindow - it's a hard bug to track down -# if it doesn't. - +# (KParts.MainWindow subclasses TDEMainWindow). class pyPartsMW (KParts.MainWindow): def __init__ (self, *args): - apply (KParts.MainWindow.__init__, (self,) + args) + KParts.MainWindow.__init__(self, *args) # Create the actions for our menu/toolbar to use # Keep in mind that the part loaded will provide its @@ -90,19 +80,19 @@ class pyPartsMW (KParts.MainWindow): KStdAction.configureToolbars(self.optionsConfigureToolbars, self.actionCollection()); self.path = os.getcwd () + '/' - self.setGeometry (0, 0, 600, 500) + self.setGeometry (0, 0, 1024, 768) # point to our XML file - self.setXMLFile (self.path + "pyParts.rc", FALSE) + self.setXMLFile (self.path + "pyParts.rc", False) # The next few lines are all that's necessary to # create a web browser (of course you have to edit # this file to change url's) self.w = TDEHTMLPart (self, "HTMLPart", self); - self.w.openURL (KURL ("http://www.kde.org")); + self.w.openURL (KURL ("http://www.trinitydesktop.org")); - self.w.view ().setGeometry (30, 55, 500, 400); + self.w.view ().setGeometry (30, 30, 1024-60, 768-60); # self.v = TDEHTMLView (self.w, self) @@ -143,21 +133,21 @@ class pyPartsMW (KParts.MainWindow): # some boilerplate left over from pyKLess/KLess def queryClose(self): res = KMessageBox.warningYesNoCancel(self,\ - i18n("Save changes to Document?<br>(Does not make sense, we know, but it is just a programming example :-)")) + i18n("<qt>Save changes to Document?<br/>(Does not make sense, we know, but it is just a programming example :-)</qt>")) if res == KMessageBox.Yes: - #// save document here. If saving fails, return FALSE - return TRUE + #// save document here. If saving fails, return False + return True elif res == KMessageBox.No: - return TRUE + return True else: #// cancel - return FALSE + return False def queryExit(self): #// this slot is invoked in addition when the *last* window is going #// to be closed. We could do some final cleanup here. - return TRUE #// accept + return True #// accept # I'm not sure the session mgmt stuff here works @@ -181,16 +171,16 @@ class pyPartsMW (KParts.MainWindow): #------------- main ---------------------------- # A Human readable description of your program -description = "TDEHTMLPart - simple example" +description = b"TDEHTMLPart - simple example" # The version -version = "0.1" +version = b"0.1" # stuff for the "About" menu -aboutData = TDEAboutData ("pyTDEHTMLPart", "pyHTMLPart",\ +aboutData = TDEAboutData (b"pyTDEHTMLPart", b"pyHTMLPart",\ version, description, TDEAboutData.License_GPL,\ - "(c) 2002, Jim Bublitz") + b"(c) 2002, Jim Bublitz") -aboutData.addAuthor ("Jim Bublitz", "Example for PyKDE", "[email protected]") +aboutData.addAuthor (b"Jim Bublitz", b"Example for PyTDE", b"[email protected]") # This MUST go here (before TDEApplication () is called) TDECmdLineArgs.init (sys.argv, aboutData) diff --git a/examples/pytde-sampler/HOWTO.samples b/examples/pytde-sampler/HOWTO.samples index 8006eb4..18b3f4b 100644 --- a/examples/pytde-sampler/HOWTO.samples +++ b/examples/pytde-sampler/HOWTO.samples @@ -1,4 +1,4 @@ -How to Write Samples for the PyKDE Sampler +How to Write Samples for the PyTDE Sampler ========================================== @@ -12,11 +12,11 @@ In side the module, add the following: default: 'filenew' example: 'colorize' - When supplied, this should be the short name of a KDE icon, such as + When supplied, this should be the short name of a TDE icon, such as 'stop', 'editclear', etc. If available, This icon will be used as the list item's icon in the sampler. Not all icons are available in all themes, so try to use the icons that are available in the - default KDE installation. + default TDE installation. - labelText - string (optional) diff --git a/examples/pytde-sampler/about.py b/examples/pytde-sampler/about.py index f675b1c..c58de92 100644 --- a/examples/pytde-sampler/about.py +++ b/examples/pytde-sampler/about.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -""" About the PyKDE Sampler +""" About the PyTDE Sampler Defines the 'about' function to create a TDEAboutData instance for the sampler application. @@ -8,16 +8,16 @@ from os.path import dirname, join from tdecore import TDEAboutData -appName = 'pytdesampler' -progName = 'PyKDE Sampler' -authorName = 'Troy Melhase' -authorEmail = bugsEmailAddress = '[email protected]' -version = '0.1' -shortDescription = 'The PyKDE Sampler' +appName = b'pytdesampler' +progName = b'PyTDE Sampler' +authorName = b'Troy Melhase' +authorEmail = bugsEmailAddress = b'[email protected]' +version = b'0.1' +shortDescription = b'The PyTDE Sampler' licenseType = TDEAboutData.License_GPL_V2 -copyrightStatement = '(c) 2006, %s' % (authorName, ) -homePageAddress = 'http://www.riverbankcomputing.co.uk/pytde/' -aboutText = ("The application sampler for PyKDE.") +copyrightStatement = '(c) 2006, Troy Melhase' +homePageAddress = b'http://www.riverbankcomputing.co.uk/pytde/' +aboutText = (b"The application sampler for PyTDE.") contributors = [] # module-level global for keeping the strings around; intentional diff --git a/examples/pytde-sampler/basic_widgets/__init__.py b/examples/pytde-sampler/basic_widgets/__init__.py index 35e708d..014db50 100644 --- a/examples/pytde-sampler/basic_widgets/__init__.py +++ b/examples/pytde-sampler/basic_widgets/__init__.py @@ -1,7 +1,7 @@ labelText = 'Widgets' iconName = 'about_kde' -helpText = """KDE provides a large set of basic widgets for application use. +helpText = """TDE provides a large set of basic widgets for application use. Select the children of this item to see for yourself.""" from PyTQt.qt import TQFrame, TQVBoxLayout diff --git a/examples/pytde-sampler/basic_widgets/historycombo.py b/examples/pytde-sampler/basic_widgets/historycombo.py index f0bb8b8..bfca05e 100644 --- a/examples/pytde-sampler/basic_widgets/historycombo.py +++ b/examples/pytde-sampler/basic_widgets/historycombo.py @@ -49,5 +49,5 @@ class MainFrame(TQFrame): self.historySelection.setText) def historyCleared(self): - print 'History combo cleared.' + print('History combo cleared.') diff --git a/examples/pytde-sampler/contributors.txt b/examples/pytde-sampler/contributors.txt index 5063545..0f0e286 100644 --- a/examples/pytde-sampler/contributors.txt +++ b/examples/pytde-sampler/contributors.txt @@ -1,4 +1,4 @@ # author, contributions, email Phil Thompson, For PyTQt and SIP, [email protected] -Jim Bublitz, For PyKDE, [email protected] +Jim Bublitz, For PyTDE, [email protected] diff --git a/examples/pytde-sampler/dialogs/__init__.py b/examples/pytde-sampler/dialogs/__init__.py index c9c105a..caab63d 100644 --- a/examples/pytde-sampler/dialogs/__init__.py +++ b/examples/pytde-sampler/dialogs/__init__.py @@ -2,7 +2,7 @@ labelText = 'Dialog Boxes' iconName = 'launch' -helpText = ("KDE provides a convenient set of dialog boxes for application use. " +helpText = ("TDE provides a convenient set of dialog boxes for application use. " "Select the children of this item to see for yourself.") diff --git a/examples/pytde-sampler/dialogs/about/__init__.py b/examples/pytde-sampler/dialogs/about/__init__.py index 9fd612d..9d0092f 100644 --- a/examples/pytde-sampler/dialogs/about/__init__.py +++ b/examples/pytde-sampler/dialogs/about/__init__.py @@ -1,7 +1,7 @@ labelText = 'About Dialogs' iconName = 'info' -helpText = ("KDE has multiple dialog types to display information about your " +helpText = ("TDE has multiple dialog types to display information about your " "applicaiton and environment. They provide a tremendous amount of functionality " "and consistency. They're easy to use, and they're good for the environment!") diff --git a/examples/pytde-sampler/dialogs/about/aboutkde.py b/examples/pytde-sampler/dialogs/about/abouttde.py index e50c88d..43e354f 100644 --- a/examples/pytde-sampler/dialogs/about/aboutkde.py +++ b/examples/pytde-sampler/dialogs/about/abouttde.py @@ -1,5 +1,5 @@ iconName = 'about_kde' -labelText = 'TDEAboutKDE' +labelText = 'TDEAboutTDE' from PyTQt.qt import TQFrame, TQHBoxLayout, TQVBoxLayout, SIGNAL from tdecore import i18n @@ -7,13 +7,13 @@ from tdeui import TDEAboutKDE, KPushButton, KTextEdit helpText = ("Typically available via the applications 'Help' menu, this " - "dialog presents the user with the standard KDE About dialog.") + "dialog presents the user with the standard TDE About dialog.") class MainFrame(TQFrame): def __init__(self, parent=None): TQFrame.__init__(self, parent) - self.button = KPushButton(i18n('About KDE'), self) + self.button = KPushButton(i18n('About TDE'), self) self.help = KTextEdit(helpText, '', self) layout = TQVBoxLayout(self, 4) layout.addWidget(self.help) diff --git a/examples/pytde-sampler/dialogs/bugreport.py b/examples/pytde-sampler/dialogs/bugreport.py index b06717c..74fce7e 100644 --- a/examples/pytde-sampler/dialogs/bugreport.py +++ b/examples/pytde-sampler/dialogs/bugreport.py @@ -1,7 +1,7 @@ iconName = 'core' labelText = 'KBugReport' -##~ if we wanted to, we could define the name of a KDE class used for lookup of +##~ if we wanted to, we could define the name of a TDE class used for lookup of ##~ the documentation url. The 'labelText' string above already ##~ specifies what we want. ##~ docItemName = 'KBugReport' @@ -11,7 +11,7 @@ from tdecore import i18n from tdeui import TDEAboutDialog, KPushButton, KBugReport, KTextEdit -helpText = ("KDE provides a way to report bugs from applications. This dialog" +helpText = ("TDE provides a way to report bugs from applications. This dialog" "is typically available from the application 'Help' menu.") diff --git a/examples/pytde-sampler/dialogs/color.py b/examples/pytde-sampler/dialogs/color.py index f9aeb0c..ea567e2 100644 --- a/examples/pytde-sampler/dialogs/color.py +++ b/examples/pytde-sampler/dialogs/color.py @@ -7,7 +7,7 @@ from tdecore import i18n from tdeui import KPushButton, KColorDialog, KColorPatch, KTextEdit -helpText = ("KDE provides a nifty common color selection dialog." +helpText = ("TDE provides a nifty common color selection dialog." "The color selection in the dialog is tracked via a SIGNAL " "connected to the KColorPatch area below.") diff --git a/examples/pytde-sampler/dialogs/edfind.py b/examples/pytde-sampler/dialogs/edfind.py index 46258f5..aff61cb 100644 --- a/examples/pytde-sampler/dialogs/edfind.py +++ b/examples/pytde-sampler/dialogs/edfind.py @@ -34,18 +34,18 @@ class MainFrame(TQFrame): def doneClicked(self): - print 'done searching' + print('done searching') def searchClicked(self): - print 'searching: ', self.dlg.getText(), + print('searching: ', self.dlg.getText(), end=' ') if self.dlg.get_direction(): - print '(backwards) ', + print('(backwards) ', end=' ') else: - print '(forwards) ', + print('(forwards) ', end=' ') if self.dlg.case_sensitive(): - print '(case-sensitive)' + print('(case-sensitive)') else: - print '(case-insensitive)' + print('(case-insensitive)') diff --git a/examples/pytde-sampler/dialogs/edreplace.py b/examples/pytde-sampler/dialogs/edreplace.py index 1c4950b..31b03b9 100644 --- a/examples/pytde-sampler/dialogs/edreplace.py +++ b/examples/pytde-sampler/dialogs/edreplace.py @@ -33,19 +33,19 @@ class MainFrame(TQFrame): def doneClicked(self): - print 'done replacing' + print('done replacing') def replaceClicked(self): - print 'replacing: ', self.dlg.getText() + print('replacing: ', self.dlg.getText()) return if self.dlg.get_direction(): - print '(backwards) ', + print('(backwards) ', end=' ') else: - print '(forwards) ', + print('(forwards) ', end=' ') if self.dlg.case_sensitive(): - print '(case-sensitive)' + print('(case-sensitive)') else: - print '(case-insensitive)' + print('(case-insensitive)') diff --git a/examples/pytde-sampler/dialogs/font.py b/examples/pytde-sampler/dialogs/font.py index 175817a..298f44f 100644 --- a/examples/pytde-sampler/dialogs/font.py +++ b/examples/pytde-sampler/dialogs/font.py @@ -6,7 +6,7 @@ from tdeui import KPushButton, TDEFontDialog, KTextEdit iconName = 'fonts' labelText = 'TDEFontDialog' docParts = ('tdeui', 'TDEFontDialog') -helpText = ("KDE provides a font dialog box for users to select (can you " +helpText = ("TDE provides a font dialog box for users to select (can you " "guess??) fonts. The button below displays a font dialog box. " "The font of this widget (the text widget you're reading) is used " "as the default. If the dialog is accepted, the font of this " diff --git a/examples/pytde-sampler/dialogs/msgbox.py b/examples/pytde-sampler/dialogs/msgbox.py index 93f0d24..1ccfe3a 100644 --- a/examples/pytde-sampler/dialogs/msgbox.py +++ b/examples/pytde-sampler/dialogs/msgbox.py @@ -3,7 +3,7 @@ labelText = 'KMessageBox' from random import random from traceback import print_exc -from StringIO import StringIO +from io import StringIO from PyTQt.qt import TQFrame, TQGridLayout, TQLabel, TQStringList, SIGNAL from tdecore import i18n @@ -87,11 +87,11 @@ class MainFrame(TQFrame): def questionYesNo(self): dlg = KMessageBox.questionYesNo(self, self.msg, self.caption) - print 'You pressed "%s"' % (self.responses.get(dlg, dlg), ) + print('You pressed "%s"' % (self.responses.get(dlg, dlg), )) def warningYesNoCancel(self): dlg = KMessageBox.warningYesNoCancel(self, self.msg, self.caption) - print 'You pressed "%s"' % (self.responses.get(dlg, dlg), ) + print('You pressed "%s"' % (self.responses.get(dlg, dlg), )) def warningContinueCancelList(self): uiitem = KGuiItem('Time to Eat', 'favorites') @@ -99,43 +99,43 @@ class MainFrame(TQFrame): dlgid = '%s' % random() args = self, self.msg, self.items, self.caption, uiitem, dlgid dlg = ctor(*args) - print 'You pressed "%s"' % (self.responses.get(dlg, dlg), ) + print('You pressed "%s"' % (self.responses.get(dlg, dlg), )) def error(self): dlg = KMessageBox.error(self, self.err) - print 'You pressed "%s"' % (self.responses.get(dlg, dlg), ) + print('You pressed "%s"' % (self.responses.get(dlg, dlg), )) def detailedError(self): try: x = self.thisAttributeDoesNotExist - except (AttributeError, ), ex: + except (AttributeError, ) as ex: handle = StringIO() print_exc(0, handle) details = handle.getvalue() dlg = KMessageBox.detailedError(self, self.err, details) - print 'You pressed "%s"' % (self.responses.get(dlg, dlg), ) + print('You pressed "%s"' % (self.responses.get(dlg, dlg), )) def sorry(self): dlg = KMessageBox.sorry(self, self.err) - print 'You pressed "%s"' % (self.responses.get(dlg, dlg), ) + print('You pressed "%s"' % (self.responses.get(dlg, dlg), )) def detailedSorry(self): try: x = self.thisAttributeDoesNotExist - except (AttributeError, ), ex: + except (AttributeError, ) as ex: handle = StringIO() print_exc(0, handle) details = handle.getvalue() dlg = KMessageBox.detailedSorry(self, self.err, details) - print 'You pressed "%s"' % (self.responses.get(dlg, dlg), ) + print('You pressed "%s"' % (self.responses.get(dlg, dlg), )) def information(self): dlgid = '%s' % random() dlg = KMessageBox.information(self, self.info, '', dlgid) - print 'You pressed "%s"' % (self.responses.get(dlg, dlg), ) + print('You pressed "%s"' % (self.responses.get(dlg, dlg), )) def informationList(self): dlgid = '%s' % random() ctor = KMessageBox.informationList dlg = ctor(self, self.info, self.items, '', dlgid) - print 'You pressed "%s"' % (self.responses.get(dlg, dlg), ) + print('You pressed "%s"' % (self.responses.get(dlg, dlg), )) diff --git a/examples/pytde-sampler/dialogs/passwd.py b/examples/pytde-sampler/dialogs/passwd.py index 3a7fd29..93d66f9 100644 --- a/examples/pytde-sampler/dialogs/passwd.py +++ b/examples/pytde-sampler/dialogs/passwd.py @@ -5,7 +5,7 @@ from tdeui import KPushButton, KPasswordDialog, KTextEdit iconName = 'password' labelText = 'KPasswordDialog' docParts = ('tdeui', 'KPasswordDialog') -helpText = ("KDE provides two variations on the password dialog. The simple " +helpText = ("TDE provides two variations on the password dialog. The simple " "one shown here prompts for a password. The other type allows the " "user to enter a new password, and provides a second field to " "confirm the first entry.") diff --git a/examples/pytde-sampler/dialogs/progress.py b/examples/pytde-sampler/dialogs/progress.py index f7d69f8..b2ead9a 100644 --- a/examples/pytde-sampler/dialogs/progress.py +++ b/examples/pytde-sampler/dialogs/progress.py @@ -7,7 +7,7 @@ from tdecore import i18n from tdeui import KPushButton, KProgressDialog, KTextEdit -helpText = """KDE provides a ready-built dialog to display a bit of text and a +helpText = """TDE provides a ready-built dialog to display a bit of text and a progress bar.""" diff --git a/examples/pytde-sampler/dialogs/tip.py b/examples/pytde-sampler/dialogs/tip.py index 15ec50d..2e4fc02 100644 --- a/examples/pytde-sampler/dialogs/tip.py +++ b/examples/pytde-sampler/dialogs/tip.py @@ -8,7 +8,7 @@ from tdecore import i18n from tdeui import KPushButton, KTipDatabase, KTipDialog, KTextEdit -helpText = ("The KDE standard Tip-of-the-Day dialog.") +helpText = ("The TDE standard Tip-of-the-Day dialog.") class MainFrame(TQFrame): diff --git a/examples/pytde-sampler/dialogs/tips b/examples/pytde-sampler/dialogs/tips index 9f24457..e0439dc 100644 --- a/examples/pytde-sampler/dialogs/tips +++ b/examples/pytde-sampler/dialogs/tips @@ -1,23 +1,23 @@ -<tip category="PyKDE Sampler|General"> +<tip category="PyTDE Sampler|General"> <html> <p>Don't tug on Superman's cape.</p> </html> </tip> -<tip category="PyKDE Sampler|General"> +<tip category="PyTDE Sampler|General"> <html> <p>Don't spit into the wind.</p> </html> </tip> -<tip category="PyKDE Sampler|General"> +<tip category="PyTDE Sampler|General"> <html> <p>Don't pull the mask off the Lone Ranger.</p> </html> </tip> -<tip category="PyKDE Sampler|General"> +<tip category="PyTDE Sampler|General"> <html> <p>And don't mess around with <em>Jim</em>!</p> </html> diff --git a/examples/pytde-sampler/gen_todo.py b/examples/pytde-sampler/gen_todo.py index 0fc60c4..fa48137 100644 --- a/examples/pytde-sampler/gen_todo.py +++ b/examples/pytde-sampler/gen_todo.py @@ -2,7 +2,7 @@ mods = ['dcop', 'tdecore', 'tdefx', 'tdeprint', 'tdesu', 'tdeui', 'tdefile', 'td all = [] -print 'Module,Item,Path,Contributor' +print('Module,Item,Path,Contributor') for mod in mods: module = __import__(mod) items = dir(module) @@ -12,7 +12,7 @@ for mod in mods: for item in items: all.append(item) - print '%s,%s,,,' % (mod, item, ) + print('%s,%s,,,' % (mod, item, )) diff --git a/examples/pytde-sampler/icon_handling/__init__.py b/examples/pytde-sampler/icon_handling/__init__.py index 0b82073..87ee0c7 100644 --- a/examples/pytde-sampler/icon_handling/__init__.py +++ b/examples/pytde-sampler/icon_handling/__init__.py @@ -2,7 +2,7 @@ labelText = 'Icons' iconName = 'icons' -helpText = ("KDE icons are nice. " +helpText = ("TDE icons are nice. " "Select the children of this item to see for yourself.") diff --git a/examples/pytde-sampler/icon_handling/misc.py b/examples/pytde-sampler/icon_handling/misc.py index d3ea6a1..db7b624 100644 --- a/examples/pytde-sampler/icon_handling/misc.py +++ b/examples/pytde-sampler/icon_handling/misc.py @@ -26,6 +26,6 @@ class MainFrame(TQFrame): import os fn = os.path.abspath('.') - print fn + print(fn) self.write = KWritePermsIcon(fn) self.write.reparent(self, 0, TQPoint(0,0), True) diff --git a/examples/pytde-sampler/lib.py b/examples/pytde-sampler/lib.py index 875ae1a..d81f2c3 100644 --- a/examples/pytde-sampler/lib.py +++ b/examples/pytde-sampler/lib.py @@ -68,8 +68,8 @@ def listmodules(): path = path.replace(samplerpath, '').replace(os.path.sep, '.') try: module = namedimport(path) - except (ValueError, ImportError, ), exc: - print 'Exception %s importing %s' % (exc, path, ) + except (ValueError, ImportError, ) as exc: + print(('Exception %s importing %s' % (exc, path, ))) else: modules.append((path, module)) modules.sort() diff --git a/examples/pytde-sampler/misc/window_info.py b/examples/pytde-sampler/misc/window_info.py index 12a9d66..df9a21c 100644 --- a/examples/pytde-sampler/misc/window_info.py +++ b/examples/pytde-sampler/misc/window_info.py @@ -25,11 +25,9 @@ class MainFrame(TQFrame): def showWindowInfo(self): - main = TDEApplication.kApplication() - print main - print main.mainWidget() + app = TDEApplication.kApplication() - info = KWindowInfo(main) - info.message('Updated Window Info', 3) + info = KWindowInfo(app.activeWindow()) + info.message('Updated Window Info', 3000) diff --git a/examples/pytde-sampler/qt_widgets/CONTRIB b/examples/pytde-sampler/qt_widgets/CONTRIB index 65adb0f..e0425fd 100644 --- a/examples/pytde-sampler/qt_widgets/CONTRIB +++ b/examples/pytde-sampler/qt_widgets/CONTRIB @@ -44,7 +44,7 @@ tdecore,TDEConfigSkeleton,,, tdecore,TDEConfigSkeletonItem,,, tdecore,TDECrash,,, tdecore,KDCOPPropertyProxy,,, -tdecore,KDE,,, +tdecore,TDE,,, tdecore,KDesktopFile,,, tdecore,KEntry,,, tdecore,KEntryKey,,, diff --git a/examples/pytde-sampler/qt_widgets/table.py b/examples/pytde-sampler/qt_widgets/table.py index f3b9e54..b75d596 100644 --- a/examples/pytde-sampler/qt_widgets/table.py +++ b/examples/pytde-sampler/qt_widgets/table.py @@ -22,7 +22,7 @@ class MainFrame(TQFrame): self.help = KTextEdit(helpText, '', self) data = csv.reader(open(contrib)) - header = data.next() + header = next(data) items = [item for item in data] self.table = table = TQTable(len(items), len(header), self) diff --git a/examples/pytde-sampler/runner.py b/examples/pytde-sampler/runner.py index 8c6e8de..66056d7 100755 --- a/examples/pytde-sampler/runner.py +++ b/examples/pytde-sampler/runner.py @@ -3,13 +3,9 @@ """ import sys -from tdecore import TDEApplication, TDECmdLineArgs -from tdeui import TDEMainWindow from PyTQt.qt import TQVBoxLayout - -## relative import -- cry me a river! -import about - +from tdecore import TDEApplication, TDECmdLineArgs, TDEAboutData +from tdeui import TDEMainWindow class SamplerRunnerWindow(TDEMainWindow): def __init__(self, ctor): @@ -35,14 +31,21 @@ def importItem(name): names = name.split('.') modname, itemname = names[0:-1], names[-1] + print(str.join('.', modname)) mod = importName(str.join('.', modname)) return getattr(mod, itemname) if __name__ == '__main__': - options = [('+item', 'An item in the sys.path')] - TDECmdLineArgs.init(sys.argv, about.about) + description = b"A runner application" + version = b"1.0" + aboutData = TDEAboutData (b"", b"",\ + version, description, TDEAboutData.License_GPL,\ + b"(C) 2003 whoever the author is") + + options = [(b'+item', b'An item in the sys.path')] + TDECmdLineArgs.init(sys.argv, aboutData) TDECmdLineArgs.addCmdLineOptions(options) args = TDECmdLineArgs.parsedArgs() diff --git a/examples/pytde-sampler/sampler.py b/examples/pytde-sampler/sampler.py index fec8ab7..6534829 100755 --- a/examples/pytde-sampler/sampler.py +++ b/examples/pytde-sampler/sampler.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -""" The PyKDE application sampler +""" The PyTDE application sampler This module defines the top-level widgets for displaying the sampler application. @@ -25,7 +25,6 @@ from tdeio import TDETrader from tdeparts import createReadOnlyPart, createReadWritePart from tdehtml import TDEHTMLPart -import about import lib @@ -114,7 +113,7 @@ class SamplerFrame(CommonFrame): try: frameType = module.builder() except (AttributeError, ): - print 'No sample callable defined in %s' % (module.name(), ) + print('No sample callable defined in %s' % (module.name(), )) else: frame = frameType(self) self.setWidget(frame) @@ -132,7 +131,7 @@ class SourceFrame(CommonFrame): def showModuleSource(self, item, module): if not self.part: - print 'No part available for displaying python source.' + print('No part available for displaying python source.') return try: modulefile = inspect.getabsfile(module.module) @@ -147,7 +146,7 @@ class WebFrame(CommonFrame): """ frame with part for viewing web pages """ - docBase = 'http://www.riverbankcomputing.com/Docs/PyKDE3/classref/' + docBase = 'http://www.riverbankcomputing.com/Docs/PyTDE3/classref/' def __init__(self, parent): CommonFrame.__init__(self, parent) @@ -155,7 +154,7 @@ class WebFrame(CommonFrame): #part.connect(part, SIGNAL('tdehtmlMousePressEvent(a)'), self.onURL) def onURL(self, a): - print '****', a + print('****', a) def showDocs(self, item, module): try: @@ -207,7 +206,7 @@ class SamplerListView(TDEListView): self.setRootIsDecorated(True) modules = lib.listmodules() - modules.sort(lambda a, b: cmp(a[0], b[0])) + modules.sort(key=lambda a: a[0]) modmap = dict(modules) modules = [(name.split('.'), name, mod) for name, mod in modules] @@ -233,7 +232,7 @@ class SamplerListView(TDEListView): subitem.setPixmap(0, getIcon(module.icon())) subitem = item - for root in roots.values(): + for root in list(roots.values()): self.setOpen(root, True) @@ -272,8 +271,8 @@ class SamplerMainWindow(TDEMainWindow): self.resize(640, 480) height, width = self.height(), self.width() - hSplit.setSizes([width * 0.35, width * 0.65]) - vSplit.setSizes([height * 0.80, height * 0.20]) + hSplit.setSizes([int(width * 0.35), int(width * 0.65)]) + vSplit.setSizes([int(height * 0.80), int(height * 0.20)]) self.xmlRcFileName = os.path.abspath(os.path.join(os.path.dirname(__file__), 'sampler.rc')) self.setXMLFile(self.xmlRcFileName) @@ -357,7 +356,7 @@ class SamplerMainWindow(TDEMainWindow): """ ret = KKeyDialog.configure(self.actionCollection(), self) - print ret + print(ret) if ret == TQDialog.Accepted: actions = self.actionCollection() actions.writeShortcutSettings(None, appConfig()) @@ -404,12 +403,18 @@ class SamplerMainWindow(TDEMainWindow): def reloadModule(self, item, module): - print >> sys.__stdout__, 'reload: ', reload(module.module) + print('reload: ', importlib.reload(module.module), file=sys.__stdout__) if __name__ == '__main__': - aboutdata = about.about() - TDECmdLineArgs.init(sys.argv, aboutdata) + description = b"A sampler application" + version = b"1.0" + aboutData = TDEAboutData (b"", b"",\ + version, description, TDEAboutData.License_GPL,\ + b"(C) 2003 whoever the author is") + + options = [(b'+item', b'An item in the sys.path')] + TDECmdLineArgs.init(sys.argv, aboutData) app = TDEApplication() splashpix = TQPixmap(os.path.join(lib.samplerpath, 'aboutkde.png')) diff --git a/examples/pytde-sampler/wizards/__init__.py b/examples/pytde-sampler/wizards/__init__.py deleted file mode 100644 index 63472b4..0000000 --- a/examples/pytde-sampler/wizards/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -iconName = 'wizard' -labelText = 'Wizards' diff --git a/examples/pytde-sampler/wizards/wiz.py b/examples/pytde-sampler/wizards/wiz.py deleted file mode 100644 index 1cb5544..0000000 --- a/examples/pytde-sampler/wizards/wiz.py +++ /dev/null @@ -1,2 +0,0 @@ -iconName = 'wizard' -labelText = 'Wizard' diff --git a/examples/pytde-sampler/xwin/__init__.py b/examples/pytde-sampler/xwin/__init__.py index 40b452a..41563ee 100644 --- a/examples/pytde-sampler/xwin/__init__.py +++ b/examples/pytde-sampler/xwin/__init__.py @@ -1,7 +1,7 @@ labelText = 'X Windows Features' iconName = 'kcmx' -helpText = """KDE and PyKDE allow interaction with the X Window system. Check +helpText = """TDE and PyTDE allow interaction with the X Window system. Check out the nifty samples below.""" from PyTQt.qt import TQFrame, TQLabel, TQVBoxLayout diff --git a/examples/qxembedexample.py b/examples/qxembedexample.py index ac8d30d..eb42a26 100644 --- a/examples/qxembedexample.py +++ b/examples/qxembedexample.py @@ -73,7 +73,7 @@ class QXEmbedExample(TQWidget): def launchApp(self): - print "QXEmbedExample.launchApp(): Not implemented yet" + print("QXEmbedExample.launchApp(): Not implemented yet") def __tr(self,s,c = None): - return tqApp.translate("QXEmbedExample",s,c) + return tqApp.translate(b"QXEmbedExample",s.encode(),c) diff --git a/examples/systray.py b/examples/systray.py index fa305b0..a4c3ff3 100644 --- a/examples/systray.py +++ b/examples/systray.py @@ -30,25 +30,36 @@ copyright holder. import sys from PyTQt.qt import TQLabel -from tdecore import TDEApplication, TDEIcon, TDEIconLoader +from tdecore import TDEAboutData, TDEApplication, TDECmdLineArgs, TDEIcon, TDEIconLoader from tdeui import TDEMainWindow, KSystemTray class MainWin (TDEMainWindow): def __init__ (self, *args): - apply (TDEMainWindow.__init__, (self,) + args) + TDEMainWindow.__init__(self, *args) #-------------------- main ------------------------------------------------ -appName = "template" -app = TDEApplication (sys.argv, appName) -mainWindow = MainWin (None, "main window") +description = b"A basic application template" +version = b"1.0" +aboutData = TDEAboutData (b"MyApp", b"MyApp",\ + version, description, TDEAboutData.License_GPL,\ + b"(C) 2003 whoever the author is") + +aboutData.addAuthor (b"author1", b"whatever they did", b"email@somedomain") +aboutData.addAuthor (b"author2", b"they did something else", b"[email protected]") + +TDECmdLineArgs.init (sys.argv, aboutData) + +TDECmdLineArgs.addCmdLineOptions ([(b"+files", b"File to open")]) + +app = TDEApplication () +mainWindow = MainWin(None, "main window") icons = TDEIconLoader () systray = KSystemTray (mainWindow) systray.setPixmap (icons.loadIcon("process-stop", TDEIcon.Desktop)) systray.show () -#mainWindow.show() app.exec_loop() diff --git a/examples/uimodules/uidialogs.py b/examples/uimodules/uidialogs.py index 12ad10f..697deb8 100644 --- a/examples/uimodules/uidialogs.py +++ b/examples/uimodules/uidialogs.py @@ -16,11 +16,6 @@ Information = 4 Sorry = 5 Error = 6 -# Python 2.2.2 supplies these, but they're duplicated here -# for backward compatibility -False = 0 -True = 1 - class CustomDlg (KDialog): def __init__ (self, parent, name = "custom dlg", modal = False): KDialog.__init__ (self, parent, name, modal) @@ -127,10 +122,10 @@ class MessageDlg (KDialog): def dlgTDEAboutDialog (parent): dlg = TDEAboutDialog (parent, 'about dialog', False) dlg.setLogo (TQPixmap ("pytestimage.png")) - dlg.setTitle ("UISampler for PyKDE") + dlg.setTitle ("UISampler for PyTDE") dlg.setAuthor ("Jim Bublitz", "[email protected]", "http://www.riverbankcomputing.co.uk",\ - "\n\nPyKDE -- Python bindings\n\tfor KDE") - dlg.addContributor ("PyKDE list", "[email protected]", TQString.null, TQString.null) + "\n\nPyTDE -- Python bindings\n\tfor TDE") + dlg.addContributor ("PyTDE list", "[email protected]", TQString.null, TQString.null) dlg.show () @@ -189,8 +184,8 @@ def dlgKKeyDialog (parent): def dlgKLineEditDlg (parent): result, ok = KLineEditDlg.getText ("Enter text", "<Your input here>", parent) - print "result", result - print "ok", ok + print("result", result) + print("ok", ok) # pop up another dlg to show what happened in the KLineEditDlg if ok: @@ -227,6 +222,6 @@ def dlgKWizard (parent): wiz.show () if __name__ == "__main__": - print - print "Please run uisampler.py" - print
\ No newline at end of file + print() + print("Please run uisampler.py") + print() diff --git a/examples/uimodules/uimenus.py b/examples/uimodules/uimenus.py index bec0c0f..025663a 100644 --- a/examples/uimodules/uimenus.py +++ b/examples/uimodules/uimenus.py @@ -103,6 +103,6 @@ def menuKWindowListMenu (parent): if __name__ == "__main__": - print - print "Please run uisampler.py" - print
\ No newline at end of file + print() + print("Please run uisampler.py") + print() diff --git a/examples/uimodules/uimisc.py b/examples/uimodules/uimisc.py index c922fb1..4536092 100644 --- a/examples/uimodules/uimisc.py +++ b/examples/uimodules/uimisc.py @@ -234,6 +234,6 @@ def miscQXEmbed (parent): parent.currentPageObj = PageNotImpl (parent) if __name__ == "__main__": - print - print "Please run uisampler.py" - print
\ No newline at end of file + print() + print("Please run uisampler.py") + print() diff --git a/examples/uimodules/uiwidgets.py b/examples/uimodules/uiwidgets.py index 790f855..106a559 100644 --- a/examples/uimodules/uiwidgets.py +++ b/examples/uimodules/uiwidgets.py @@ -1,7 +1,7 @@ import time, sys -from PyTQt.qt import TQLabel, TQFrame, TQColor, TQPushButton, SIGNAL, TQButtonGroup, TQRadioButton, TQt, TQString, TQChar,\ - TQWidget, TQTimer +from PyTQt.qt import TQLabel, TQFrame, TQColor, TQPushButton, SIGNAL, TQButtonGroup, TQRadioButton, \ + TQt, TQString, TQChar, TQWidget, TQTimer from tdecore import TDEApplication from tdeui import KEdit, KComboBox, KColorCombo, KEditListBox, TDEListBox, KLineEdit, KRestrictedLine,\ @@ -12,10 +12,6 @@ from tdeui import KEdit, KComboBox, KColorCombo, KEditListBox, TDEListBox, KLine KIntNumInput, KDoubleNumInput, KPasswordEdit, KURLLabel, KPaletteTable,\ KSeparator -if sys.version [:6] < "2.2.2": - False = 0 - True = 1 - class Page1: def __init__ (self, parent): self.page = parent.addPage () @@ -350,7 +346,7 @@ class Page5: urlLbl.setGeometry (x, y, 100, 20) urlLbl.show () - url = KURLLabel ("http://riverbankcomputing.co.uk", "PyKDE", self.page) + url = KURLLabel ("http://riverbankcomputing.co.uk", "PyTDE", self.page) url.setGeometry (x, y + 20, 100, 20) url.setUseTips (True) url.setTipText ("http://riverbankcomputing.co.uk") @@ -749,6 +745,6 @@ def widKURLLabel (parent): if __name__ == "__main__": - print - print "Please run uisampler.py" - print
\ No newline at end of file + print() + print("Please run uisampler.py") + print() diff --git a/examples/uiqxembed.py b/examples/uiqxembed.py index 341cc3a..21e31da 100644 --- a/examples/uiqxembed.py +++ b/examples/uiqxembed.py @@ -69,7 +69,7 @@ class ExampleForm(QXEmbedExample): self.launchPid = pid ## cheap TQTimer.singleShot(2000, self.embedLaunchedWindow) else: - print 'failed to start %s' % name + print('failed to start %s' % name) return def embedLaunchedWindow(self): @@ -101,16 +101,16 @@ class ExampleMain(TDEMainWindow): if __name__ == '__main__': - aname = 'PyKDE QXEmbed Sample' - desc = 'A Simple PyKDE QXEmbed Sample' - ver = '1.0' + aname = b'PyTDE QXEmbed Sample' + desc = b'A Simple PyTDE QXEmbed Sample' + ver = b'1.0' lic = TDEAboutData.License_GPL - author = 'Troy Melhase' - authormail = '[email protected]' + author = b'Troy Melhase' + authormail = b'[email protected]' - about = TDEAboutData(aname, aname, ver, desc, lic, '%s (c) 2004' % authormail) - about.addAuthor(author, 'hi, mom!', authormail) - about.addAuthor ('Jim Bublitz', 'For PyKDE', '[email protected]') + about = TDEAboutData(aname, aname, ver, desc, lic, b'[email protected] (c) 2004') + about.addAuthor(author, b'hi, mom!', authormail) + about.addAuthor (b'Jim Bublitz', b'For PyTDE', b'[email protected]') TDECmdLineArgs.init(sys.argv, about) app = TDEApplication() mainWindow = ExampleMain() diff --git a/examples/uisampler.py b/examples/uisampler.py index 3465f02..76bff2a 100644 --- a/examples/uisampler.py +++ b/examples/uisampler.py @@ -12,9 +12,6 @@ from uimenus import * from uixml import * from uimisc import * -False = 0 -True = not False - listItems = {"Dialogs": {"TDEAboutDialog": ["TDEAboutApplication", "TDEAboutContainer", "KImageTrackLabel",\ "TDEAboutContainerBase", "TDEAboutContributor", "TDEAboutWidget"],\ @@ -125,7 +122,7 @@ prefix = {"Dialogs": "dlg", "Widgets": "wid", "XML": "xml", "Menus/Toolbars": "m mainGeom = TQRect (0, 0, 640, 500) treeWidth = 220 -blankMsg = """ UISampler - provides examples of PyKDE widgets +blankMsg = """ UISampler - provides examples of PyTDE widgets Select a dialog/widget/menu/etc example from the tree at left """ @@ -133,9 +130,9 @@ Select a dialog/widget/menu/etc example from the tree at left class MainWin (TDEMainWindow): def __init__ (self, *args): - apply (TDEMainWindow.__init__, (self,) + args) + TDEMainWindow.__init__(*(self,) + args) - self.setCaption ("Samples of PyKDE widget usage") + self.setCaption ("Samples of PyTDE widget usage") self.setGeometry (mainGeom) # create the main view - list view on the left and an @@ -174,10 +171,10 @@ class MainWin (TDEMainWindow): self.mainView.setSizes ([treeWidth, 375]) self.tree.setRootIsDecorated (True) self.tree.setVScrollBarMode (TQScrollView.AlwaysOn) - topLevel = listItems.keys () + topLevel = list(listItems.keys ()) for item_1 in topLevel: parent = TQListViewItem (self.tree, item_1) - secondLevel = listItems [item_1].keys () + secondLevel = list(listItems [item_1].keys ()) for item_2 in secondLevel: child = TQListViewItem (parent, item_2) for item_3 in listItems [item_1][item_2]: @@ -187,11 +184,11 @@ class MainWin (TDEMainWindow): if not lvItem: return - if lvItem.text (0).latin1 () in listItems.keys (): + if lvItem.text (0).latin1 () in list(listItems.keys ()): return p = lvItem.parent () - if p.text (0).latin1 () in listItems.keys (): + if p.text (0).latin1 () in list(listItems.keys ()): pfx = prefix [p.text (0).latin1 ()] funcCall = pfx + lvItem.text (0).latin1 () + "(self)" else: @@ -219,9 +216,9 @@ class MainWin (TDEMainWindow): #-------------------- main ------------------------------------------------ -appName = "UISampler" +appName = b"UISampler" app = TDEApplication (sys.argv, appName) -mainWindow = MainWin (None, "main window") +mainWindow = MainWin (None, b"main window") mainWindow.show() app.exec_loop() diff --git a/examples/uitdemdi.py b/examples/uitdemdi.py index 144d7f0..5e3509a 100644 --- a/examples/uitdemdi.py +++ b/examples/uitdemdi.py @@ -35,7 +35,7 @@ from tdeui import KDockWidget, TDEListBox, KStdAction try: from tdemdi import KMdi, KMdiMainFrm, KMdiChildView except (ImportError, ): - print 'Exception importing KMDI; check your PyKDE installation' + print('Exception importing KMDI; check your PyTDE installation') sys.exit(1) @@ -186,16 +186,16 @@ class KmdiExample(KMdiMainFrm): if __name__ == '__main__': - aname = 'PyKDE KMDI Sample' - desc = 'A Simple PyKDE KMDI Sample' - ver = '1.0' + aname = b'PyTDE KMDI Sample' + desc = b'A Simple PyTDE KMDI Sample' + ver = b'1.0' lic = TDEAboutData.License_GPL - author = 'Troy Melhase' - authormail = '[email protected]' + author = b'Troy Melhase' + authormail = b'[email protected]' - about = TDEAboutData(aname, aname, ver, desc, lic, '%s (c) 2004' % authormail) - about.addAuthor(author, 'hi, mom!', authormail) - about.addAuthor ('Jim Bublitz', 'For PyKDE', '[email protected]') + about = TDEAboutData(aname, aname, ver, desc, lic, b'[email protected] (c) 2004') + about.addAuthor(author, b'hi, mom!', authormail) + about.addAuthor (b'Jim Bublitz', b'For PyTDE', b'[email protected]') TDECmdLineArgs.init(sys.argv, about) app = TDEApplication() mainWindow = KmdiExample() diff --git a/examples/xmlmenudemo.py b/examples/xmlmenudemo.py index 9eacb37..ce92bd3 100644 --- a/examples/xmlmenudemo.py +++ b/examples/xmlmenudemo.py @@ -1,6 +1,6 @@ """ This template constructs an application with menus, toolbar and statusbar. -It uses KDE classes and methods that simplify the task of building and +It uses TDE classes and methods that simplify the task of building and operating a GUI. It is recommended that this approach be used, rather than the primitive approach in menuapp1.py """ @@ -35,10 +35,6 @@ copyright holder. """ -False = 0 -True = not False - - import sys, os from PyTQt.qt import TQPopupMenu, SIGNAL, TQLabel, TQIconSet @@ -53,7 +49,7 @@ STATUSBAR_RIGHT = 3 class MainWin (TDEMainWindow): def __init__ (self, *args): - apply (TDEMainWindow.__init__, (self,) + args) + TDEMainWindow.__init__(self, *args) self.initActions () self.setGeometry (0, 0, 350, 200) @@ -143,8 +139,8 @@ class MainWin (TDEMainWindow): # By using KStdAction here, the XMLGUI mechanism will automatically # create a 'View' menu and insert "Zoom In" and "Zoom Out" objects # in it. This happens because before parsing our *ui.rc file, - # the standard KDE file config/ui/ui_standards.rc is parsed, and - # then our *ui.rc file is merged with the result - this gives KDE + # the standard TDE file config/ui/ui_standards.rc is parsed, and + # then our *ui.rc file is merged with the result - this gives TDE # menus and toolBars a standard "look" and item placement (including # separators). Creating the KStdActions alone is sufficient - you # could delete their references from the *ui.rc file and the menu @@ -268,24 +264,23 @@ class MainWin (TDEMainWindow): #-------------------- main ------------------------------------------------ -description = "A basic application template" -version = "1.0" - +description = b"A basic application template" +version = b"1.0" # The appName (xmlmenudemo - first argument) is required # if the program is to automatically locate it *ui.rc file -aboutData = TDEAboutData ("xmlmenudemo", "xmlmenudemo",\ +aboutData = TDEAboutData (b"xmlmenudemo", b"xmlmenudemo",\ version, description, TDEAboutData.License_GPL,\ - "(C) 2003 whoever the author is") + b"(C) 2003 whoever the author is") -aboutData.addAuthor ("author1", "whatever they did", "email@somedomain") -aboutData.addAuthor ("author2", "they did something else", "[email protected]") +aboutData.addAuthor (b"author1", b"whatever they did", b"email@somedomain") +aboutData.addAuthor (b"author2", b"they did something else", b"[email protected]") mainpath = os.path.dirname (os.path.abspath (sys.argv[0])) -TDECmdLineArgs.init (sys.argv, aboutData) -TDECmdLineArgs.addCmdLineOptions ([("+files", "File to open")]) +TDECmdLineArgs.init (sys.argv, aboutData) +TDECmdLineArgs.addCmdLineOptions ([(b"+files", b"File to open")]) app = TDEApplication () -mainWindow = MainWin (None, "main window") +mainWindow = MainWin (None, b"main window") mainWindow.show() app.exec_loop() diff --git a/extensions/dcopexport.py b/extensions/dcopexport.py index 6cb8b6b..7af07f1 100644 --- a/extensions/dcopexport.py +++ b/extensions/dcopexport.py @@ -59,8 +59,8 @@ numericTypes = ["char", "bool", "short", "int", "long", "uchar", "ushort", "uint stringTypes = ["TQString", "TQCString"] class DCOPExObj (DCOPObject): - def __init__ (self, objid = None): - if isinstance (objid, str): + def __init__(self, objid = None): + if isinstance (objid, bytes): DCOPObject.__init__ (self, objid) else: DCOPObject.__init__ (self) @@ -69,12 +69,12 @@ class DCOPExObj (DCOPObject): def process (self, meth, data, replyType, replyData): # normalize the method signature received - meth = str (DCOPClient.normalizeFunctionSignature (meth)).replace (">", "> ") + _meth = DCOPClient.normalizeFunctionSignature(meth).replace (">", "> ") # see if this method is available from us via DCOP # if we don't have it, maybe DCOPObject already provides it (eg - qt object) - if not self.matchMethod (meth): - return DCOPObject.process(self, meth, data, replyType, replyData); + if not self.matchMethod (_meth): + return DCOPObject.process(self, _meth, data, replyType, replyData); # demarshall the arg list for the actual method call and call the method s = TQDataStream (data, IO_ReadOnly) @@ -84,7 +84,7 @@ class DCOPExObj (DCOPObject): result = self.method.pymethod () else: for i in range (len (self.method.argtypes)): - arglist.append (dcop_next (s, TQCString (self.method.argtypes [i]))) + arglist.append (dcop_next (s, TQCString(self.method.argtypes[i]))) result = self.method.pymethod (*arglist) @@ -149,8 +149,9 @@ class DCOPExObj (DCOPObject): def matchMethod (self, meth): # find the method in the dict if it's there self.method = None - if meth in self.methods: - self.method = self.methods [meth] + _meth = meth.data() + if _meth in self.methods: + self.method = self.methods [_meth] return self.method != None def functions (self): @@ -158,7 +159,7 @@ class DCOPExObj (DCOPObject): # from the entries in the self.methods dict funcs = DCOPObject.functions (self) for func in self.methods.keys (): - funcs.append (" ".join ([self.methods [func].rtype, func])) + funcs.append((" ".join([self.methods[func].rtype, func])).encode()) return funcs; class DCOPExMeth: @@ -173,7 +174,7 @@ class DCOPExMeth: def parseMethod (self, method): # strip whitespace - method = str (DCOPClient.normalizeFunctionSignature (method)).replace (">", "> ") + method = DCOPClient.normalizeFunctionSignature(method.encode()).data().replace (">", "> ") # the return type (rtype) and signature (sig) self.rtype, tail = method.split (" ", 1) @@ -191,7 +192,7 @@ class DCOPExMeth: # the list of arg types self.argtypes = [] - args = tail [i + 1 : -1].split (",") + args = tail [i + 1 : -2].split (",") if args and args != [""]: for arg in args: self.argtypes.append (arg.strip ()) diff --git a/extensions/dcopext.py b/extensions/dcopext.py index f8ab5bf..e9edd30 100644 --- a/extensions/dcopext.py +++ b/extensions/dcopext.py @@ -52,12 +52,12 @@ typedefIntTypes = set(["uchar", "ushort", "uint", "ulong", "TQ_INT8", "Q_INT16", "TQ_INT32", "TQ_LONG", "TQ_UINT8", "Q_UINT16", "TQ_UINT32", "Q_ULONG", "sitze_t", "ssize_t", "int8_t", "int16_t", "int32_t", - "uint8_t", "uint16_t", "uint32_t", "pid_t", "uid_t", - "off_t"]) + "uint8_t", "uint16_t", "uint32_t", "pid_t", "uid_t", + "off_t"]) # XXX string and std::string too? stringTypes = set(["TQString", "TQCString"]) pythonStringTypes = set([TQString, TQCString, str]) -stringTypesDict = {"TQString":TQString,"TQCString":TQCString,"str":str,"unicode":unicode} +stringTypesDict = {"TQString":TQString,"TQCString":TQCString,"str":str} VOID = 0 BOOLEAN = 1 # XXX bool is not supported by dcop_add, but maybe some time... @@ -73,54 +73,54 @@ Torben Weis and Julian Rockey) The three classes below (DCOPApp, DCOPObj and DCOPMeth) allow transparent Python calls to DCOP methods. For example: - d = DCOPApp ("kicker", dcop) + d = DCOPApp ("kicker", dcop) (where "kicker" is the complete name of an application and 'dcop' is the dcopClient instance owned by the TDEApplication creating the DCOPApp instance) creates a DCOPApp instance. All of the classes in this file "borrow" a DCOPClient instance from the calling application. - d.objects + d.objects will return a list of the DCOP objects the application supplies. - o = d.object ("Panel") + o = d.object ("Panel") will return a DCOPObj corresponding to applications "Panel" DCOP object. Similarly: - o.methods + o.methods will return a list of the methods the object supplies and - m = o.method ("panelSize") + m = o.method ("panelSize") will return a DCOPMeth corresponding to Panel's panelSize() method. The m instance also holds the methods return type, list of argument types (argtypes) and argument names (argnames). - m.valid + m.valid is a boolean which indicates if the method encapsulated by m is a valid method for the application/object specified. However it isn't necessary to explicitly create the DCOPObj and DCOPMeth. - d.Panel.panelSize.valid + d.Panel.panelSize.valid for example, will also indicate if the method is valid without creating the intermediate 'o' and 'm' instances explicitly. - d = DCOPApp ("kicker", dcop) - ok, res = d.Panel.panelSize () + d = DCOPApp ("kicker", dcop) + ok, res = d.Panel.panelSize () is all the code necessary to perform the indicated DCOP call and return the value the call returns. In this case, panelSize takes no arguments and returns an int. 'ok' returns the status of the DCOP call (success = True, failure = False). - ok = d.Panel.addURLButton (TQString ("http://www.kde.org")) + ok = d.Panel.addURLButton (TQString ("http://www.kde.org")) would call addURLButton with the required argument, and return nothing but the DCOP call status(since its return type is 'void'). @@ -129,32 +129,32 @@ Note that to instantiate a DCOPObj directly, you need to have a valid DCOPApp to pass to DCOPObj's __init__ method. Similarly, DCOPMeth requires a valid DCOPOBject. For example: - d = DCOPApp ("kicker", dcop) - o = DCOPObj (d, "Panel") - m = DCOPMeth (o, "panelSize") + d = DCOPApp ("kicker", dcop) + o = DCOPObj (d, "Panel") + m = DCOPMeth (o, "panelSize") or - m = DCOPMeth (DCOPObj (DCOPApp ("kicker", dcop), "Panel"), "panelSize") + m = DCOPMeth (DCOPObj (DCOPApp ("kicker", dcop), "Panel"), "panelSize") """ # support stuff: -def _xiter(*seqences): - iters = [iter(seq) for seq in seqences] +def _xiter(*sequences): + iters = [iter(seq) for seq in sequences] - try: - while True: - yield [it.next() for it in iters] - - except StopIteration: - pass + try: + while True: + yield [next(it) for it in iters] + + except StopIteration: + pass def isStringType(s): - for stringType in pythonStringTypes: - if isinstance(s,stringType): - return True - return False + for stringType in pythonStringTypes: + if isinstance(s,stringType): + return True + return False # method syntax: # -------------- @@ -171,553 +171,550 @@ def isStringType(s): # int ::= "0x" [0-9a-fA-F]+ | [0-9]+ class MethodParser(object): - ident_r = re.compile("[_a-zA-Z][_a-zA-Z0-9]*") - num_r = re.compile("0x[0-0a-fA-F]+|[0-9]+") - - def __init__(self,method): - self.method = str(method) - self.rtype = None - self.name = None - self.args = [] - - self.parseMethod() - - def __repr__(self): - return "%s(%s)" % (self.__class__.__name__, repr(self.method)) - - def getDecl(self): - return ''.join([self.name, '(', ','.join(argtp for (argtp, kind), argname in self.args), ')']) - - def parseMethod(self): - i = self.parseRtype(self.method,0) - i, self.name = self.parseIdentifier(self.method,i) - i = self.parseArgs(self.method,i) - - if i != len(self.method): - raise SyntaxError, "invalid function definition: %s" % self.method - - @staticmethod - def skipws(s,i): - while s[i:i+1].isspace(): - i += 1 - return i - - def parseArg(self,s,i): - i, tp = self.parseType(s,i) - name = self.parseIdentifier(s,i) - - if name: - i, name = name - else: - name = None - - return i, (tp, name) - - def parseIdentifier(self,s,i): - i = MethodParser.skipws(s,i) - m = MethodParser.ident_r.match(s,i) - - if m: - return m.end(), s[i:m.end()] - else: - return False - - def parseInteger(self,s,i): - i = MethodParser.skipws(s,i) - m = MethodParser.num_r.match(s,i) - - if m: - return m.end(), s[i:m.end()] - else: - return False - - def parseArgs(self,s,i): - i = MethodParser.skipws(s,i) - - if s[i:i+1] == '(': - i += 1 - i = MethodParser.skipws(s,i) - - while i < len(s) and s[i:i+1] != ')': - i, arg = self.parseArg(s,i) - i = MethodParser.skipws(s,i) - - self.args.append(arg) - - if s[i:i+1] == ',': - i += 1 - - else: - break - - if s[i:i+1] == ')': - i += 1 - else: - raise SyntaxError, "missing ')'." - else: - raise SyntaxError, "missing '('." - - return i - - def parseType(self,s,i): - num = self.parseNumberType(s,i) - - if num: - return num - - i, ns = self.parseNamespace(s,i) - i, tp = self.parseTypespec(s,i) - - tp = ns + tp - - if tp in stringTypes: - return i, (tp, STRING) - - else: - return i, (tp, CLASS) - - def parseTypespec(self,s,i): - i, tp = self.parseIdentifier(s,i) - i, tplst = self.parseTypelist(s,i) - - return i, tp + tplst - - def parseTypelist(self,s,i): - L = [] - newi = MethodParser.skipws(s,i) - - if s[newi:newi+1] == '<': - i = newi + 1 - i = MethodParser.skipws(s,i) - - L.append('<') - - while i < len(s) and s[i:i+1] != '>': - # template-parameter can be integers!! - - num = self.parseInteger(s,i) - - if num: - i, tp = num - - else: - i, (tp, kind) = self.parseType(s,i) - - i = MethodParser.skipws(s,i) - - L.append(tp) - - if s[i:i+1] == ',': - i += 1 - L.append(',') - - else: - break - - - if s[i:i+1] == '>': - i += 1 - L.append('>') - - else: - raise SyntaxError, "missing '>'." - - return i, ''.join(L) - - def parseNumberType(self,s,i): - i, tp = self.parseIdentifier(s,i) - L = [] - - if tp == 'bool': - return i, (tp, BOOLEAN) - - elif tp in typedefIntTypes: - return i, (tp, INTEGER) - - elif tp in ('signed','unsigned'): - L.append(tp) - next = self.parseIdentifier(s,i) - - if next and next[1] in POD: - i, tp = next - - else: - # type can be fully quallyfied here! - return i, (tp, INTEGER) - - if tp in POD: - L.append(tp) - - else: - # else no number-type at all! - - return False - - # long - # long int - # long long - # long long int - # long double - # short - # short int - - if tp == 'short': - # short - - next = self.parseIdentifier(s,i) - - if next and next[1] == 'int': - # short int - - i, tp = next - L.append(tp) - - elif tp == 'long': - # long - - next = self.parseIdentifier(s,i) - - if next: - if next[1] in ('int', 'double'): - # long int - # long double - - i, tp = next - L.append(tp) - - elif next[1] == 'long': - # long long - # XXX: this is 64bit! how should I handle this? - - i, tp = next - L.append(tp) - - next = self.parseIdentifier(s,i) - - if next and next[1] == 'int': - # long long int - - i, tp = next - L.append(tp) - - if tp in ('float', 'double'): - return i, (' '.join(L), FLOAT) - - else: - return i, (' '.join(L), INTEGER) - - # - # :: - # foo:: - # ::foo:: - # foo::bar:: - # ::foo::bar:: - # ... - def parseNamespace(self,s,i): - L = [] - i = MethodParser.skipws(s,i) - - if s[i:i+2] == "::": - i += 2 - L.append("::") - - while i < len(s): - ns = self.parseIdentifier(s,i) - - if not ns: - break - - newi, ns = ns - newi = MethodParser.skipws(s,newi) - - if s[newi:newi+2] != "::": - break - - i = newi + 2 - - L.append( ns ) - L.append( "::" ) - - return i, ''.join(L) - - - def parseRtype(self,s,i): - tp = self.parseIdentifier(s,i) - - if tp and tp[1] == 'void': - i, tp = tp - self.rtype = (tp,VOID) - - else: - i, self.rtype = self.parseType(s,i) - - return i + ident_r = re.compile("[_a-zA-Z][_a-zA-Z0-9]*") + num_r = re.compile("0x[0-0a-fA-F]+|[0-9]+") + + def __init__(self,method): + self.method = method + self.rtype = None + self.name = None + self.args = [] + + self.parseMethod() + + def __repr__(self): + return "%s(%s)" % (self.__class__.__name__, repr(self.method)) + + def getDecl(self): + return ''.join([self.name, '(', ','.join(argtp for (argtp, kind), argname in self.args), ')']) + + def parseMethod(self): + i = self.parseRtype(self.method,0) + i, self.name = self.parseIdentifier(self.method,i) + i = self.parseArgs(self.method,i) + + if i != (len(self.method) - 1): + raise SyntaxError("invalid function definition: %s" % self.method) + + @staticmethod + def skipws(s,i): + while s[i:i+1].isspace(): + i += 1 + return i + + def parseArg(self,s,i): + i, tp = self.parseType(s,i) + name = self.parseIdentifier(s,i) + + if name: + i, name = name + else: + name = None + + return i, (tp, name) + + def parseIdentifier(self,s,i): + i = MethodParser.skipws(s,i) + m = MethodParser.ident_r.match(s,i) + + if m: + return m.end(), s[i:m.end()] + else: + return False + + def parseInteger(self,s,i): + i = MethodParser.skipws(s,i) + m = MethodParser.num_r.match(s,i) + + if m: + return m.end(), s[i:m.end()] + else: + return False + + def parseArgs(self,s,i): + i = MethodParser.skipws(s,i) + + if s[i:i+1] == '(': + i += 1 + i = MethodParser.skipws(s,i) + + while i < len(s) and s[i:i+1] != ')': + i, arg = self.parseArg(s,i) + i = MethodParser.skipws(s,i) + + self.args.append(arg) + + if s[i:i+1] == ',': + i += 1 + + else: + break + + if s[i:i+1] == ')': + i += 1 + else: + raise SyntaxError("missing ')'.") + else: + raise SyntaxError("missing '('.") + + return i + + def parseType(self,s,i): + num = self.parseNumberType(s,i) + + if num: + return num + + i, ns = self.parseNamespace(s,i) + i, tp = self.parseTypespec(s,i) + + tp = ns + tp + + if tp in stringTypes: + return i, (tp, STRING) + + else: + return i, (tp, CLASS) + + def parseTypespec(self,s,i): + i, tp = self.parseIdentifier(s,i) + i, tplst = self.parseTypelist(s,i) + + return i, tp + tplst + + def parseTypelist(self,s,i): + L = [] + newi = MethodParser.skipws(s,i) + + if s[newi:newi+1] == '<': + i = newi + 1 + i = MethodParser.skipws(s,i) + + L.append('<') + + while i < len(s) and s[i:i+1] != '>': + # template-parameter can be integers!! + + num = self.parseInteger(s,i) + + if num: + i, tp = num + + else: + i, (tp, kind) = self.parseType(s,i) + + i = MethodParser.skipws(s,i) + + L.append(tp) + + if s[i:i+1] == ',': + i += 1 + L.append(',') + + else: + break + + + if s[i:i+1] == '>': + i += 1 + L.append('>') + + else: + raise SyntaxError("missing '>'.") + + return i, ''.join(L) + + def parseNumberType(self,s,i): + i, tp = self.parseIdentifier(s,i) + L = [] + + if tp == 'bool': + return i, (tp, BOOLEAN) + + elif tp in typedefIntTypes: + return i, (tp, INTEGER) + + elif tp in ('signed','unsigned'): + L.append(tp) + next = self.parseIdentifier(s,i) + + if next and next[1] in POD: + i, tp = next + + else: + # type can be fully quallyfied here! + return i, (tp, INTEGER) + + if tp in POD: + L.append(tp) + + else: + # else no number-type at all! + + return False + + # long + # long int + # long long + # long long int + # long double + # short + # short int + + if tp == 'short': + # short + + next = self.parseIdentifier(s,i) + + if next and next[1] == 'int': + # short int + + i, tp = next + L.append(tp) + + elif tp == 'long': + # long + + next = self.parseIdentifier(s,i) + + if next: + if next[1] in ('int', 'double'): + # long int + # long double + + i, tp = next + L.append(tp) + + elif next[1] == 'long': + # long long + # XXX: this is 64bit! how should I handle this? + + i, tp = next + L.append(tp) + + next = self.parseIdentifier(s,i) + + if next and next[1] == 'int': + # long long int + + i, tp = next + L.append(tp) + + if tp in ('float', 'double'): + return i, (' '.join(L), FLOAT) + + else: + return i, (' '.join(L), INTEGER) + + # + # :: + # foo:: + # ::foo:: + # foo::bar:: + # ::foo::bar:: + # ... + def parseNamespace(self,s,i): + L = [] + i = MethodParser.skipws(s,i) + + if s[i:i+2] == "::": + i += 2 + L.append("::") + + while i < len(s): + ns = self.parseIdentifier(s,i) + + if not ns: + break + + newi, ns = ns + newi = MethodParser.skipws(s,newi) + + if s[newi:newi+2] != "::": + break + + i = newi + 2 + + L.append( ns ) + L.append( "::" ) + + return i, ''.join(L) + + + def parseRtype(self,s,i): + tp = self.parseIdentifier(s,i) + + if tp and tp[1] == 'void': + i, tp = tp + self.rtype = (tp,VOID) + + else: + i, self.rtype = self.parseType(s,i) + + return i def DCOPAppsIter(client): - for app in client.registeredApplications(): - yield str(app) + for app in client.registeredApplications(): + yield str(app) class DCOPApp(object): - """ - An object corresponding to an application with a DCOP interface - - Can return a list of the DCOP objects the application exposes, - or create and return an instance of a specific DCOP object. - """ - def __init__ (self, name, client): - self.appname = name - self.appclient = client - - def __getattr__ (self, item ): - if item == "objects": - objs, ok = self.appclient.remoteObjects(self.appname) - - if ok: - return objs - else: - return None - - return DCOPObj(self, item) - - def __iter__(self): - objs, ok = self.appclient.remoteObjects(self.appname) - - if ok: - for obj in objs: - yield str(obj) - - # sometimes a object-name is not a valid python identifier. - # in that case you can use dcopapp['non-valid::object/name'] - def __getitem__(self,name): - return DCOPObj(self, name) - - def object (self, object): - return DCOPObj (self, object) - - def __repr__(self): - return '%s(%s,%s)' % (self.__class__.__name__,repr(self.appname),repr(self.appclient)) - - def __str__(self): - return repr(self) + """ + An object corresponding to an application with a DCOP interface + + Can return a list of the DCOP objects the application exposes, + or create and return an instance of a specific DCOP object. + """ + def __init__ (self, name, client): + self.appname = name.encode() + self.appclient = client + + def __getattr__ (self, item ): + if item == "objects": + objs, ok = self.appclient.remoteObjects(self.appname) + + if ok: + return objs + else: + return None + + return DCOPObj(self, item) + + def __iter__(self): + objs, ok = self.appclient.remoteObjects(self.appname) + + if ok: + for obj in objs: + yield str(obj) + + # sometimes a object-name is not a valid python identifier. + # in that case you can use dcopapp['non-valid::object/name'] + def __getitem__(self,name): + return DCOPObj(self, name) + + def object (self, object): + return DCOPObj (self, object) + + def __repr__(self): + return '%s(%s,%s)' % (self.__class__.__name__,repr(self.appname),repr(self.appclient)) + + def __str__(self): + return repr(self) class DCOPObj(object): - """ - An object corresponding to a specific DCOP object owned by a - specific application with a DCOP interface - - Can return a list of the DCOP methods the object exposes, - or create and return an instance of a specific DCOP method. - """ - - def __init__ (self, *args): - if isStringType(args[0]): - self.appname = args [0] - self.objclient = args [1] - self.objname = args [2] - else: - self.appname = args [0].appname - self.objname = args [1] - self.objclient = args [0].appclient - - self.objmethods = self.getMethods() - - def __repr__( self ): - return "%s(%s,%s)" % (self.__class__.__name__,repr(self.appname), repr(self.objname)) - - def __str__( self ): - return repr(self) - - def __getattr__( self, item ): - if item == "methods": - return self.objmethods - - return DCOPMeth(self, item) - - def __getitem__(self,name): - return DCOPMeth(self, name) - - def getMethods(self): - flist, ok = self.objclient.remoteFunctions(self.appname, self.objname) - - if ok: - return flist - else: - return None - - def __iter__(self): - flist, ok = self.objclient.remoteFunctions(self.appname, self.objname) - - if ok: - for meth in flist: - yield str(meth) - - def getMethodNames(self): - return [MethodParser(meth).name for meth in self.objmethods] - - def getParsedMethods(self): - return [MethodParser(meth) for meth in self.objmethods] - - def method(self, method): - return DCOPMeth(self, method) + """ + An object corresponding to a specific DCOP object owned by a + specific application with a DCOP interface + + Can return a list of the DCOP methods the object exposes, + or create and return an instance of a specific DCOP method. + """ + + def __init__ (self, *args): + if isStringType(args[0]): + self.appname = args [0].encode() + self.objclient = args [1] + self.objname = args [2] + else: + self.appname = args [0].appname + self.objname = args [1] + self.objclient = args [0].appclient + + self.objmethods = self.getMethods() + + def __repr__( self ): + return "%s(%s,%s)" % (self.__class__.__name__,repr(self.appname), repr(self.objname)) + + def __str__( self ): + return repr(self) + + def __getattr__( self, item ): + if item == "methods": + return self.objmethods + + return DCOPMeth(self, item) + + def __getitem__(self,name): + return DCOPMeth(self, name) + + def getMethods(self): + flist, ok = self.objclient.remoteFunctions(self.appname, self.objname.encode()) + + if ok: + return flist + else: + return None + + def __iter__(self): + flist, ok = self.objclient.remoteFunctions(self.appname, self.objname) + + if ok: + for meth in flist: + yield str(meth) + + def getMethodNames(self): + return [MethodParser(meth).name for meth in self.objmethods] + + def getParsedMethods(self): + return [MethodParser(meth) for meth in self.objmethods] + + def method(self, method): + return DCOPMeth(self, method) class DCOPMeth(object): - """ - An object corresponding to a specific DCOP method owned by a - specific DCOP object. - """ - def __init__(self, dcopObj, name): - self.argtypes = [] - self.argnames = [] - self.fcnname = [] - self.rtype = [] - self.appname = dcopObj.appname - self.objname = dcopObj.objname - self.methname = name - self.client = dcopObj.objclient - try: - self.methods = [str(meth) for meth in dcopObj.objmethods] - except TypeError: - self.methods = [] - self.valid = self.findMethod() -# -# if not self.valid: -# self.fcnname = self.rtype = self.argtypes = self.argnames = None - - def __repr__( self ): - return "%s(%s,%s,%s)" % (self.__class__.__name__,repr(self.appname),repr(self.objname),repr(self.methname)) - - def __str__(self): - return repr(self) - - def __call__(self, *args): - return self.dcop_call(args) - - def __iter__(self): - return iter(self.fcnname) - - def dcop_call(self, args): - # method valid? - if not self.valid: - return False, None - - found = self.getMatchingMethod(args) - - if found is None: - return False, None - - meth, argtypes = found - - ok, replyType, replyData = self.client.call(self.appname, self.objname, meth, self.__marshall(args,argtypes)) - - if ok: - return ok, self.__unmarshall(replyData, replyType) - else: - return ok, None - - def getMatchingMethod(self,args): - count = len(args) - - for funct, argtypes in _xiter(self.fcnname, self.argtypes): - if len(argtypes) == count: - match = True - - for (wanttp, wantkind), have in _xiter(argtypes,args): - if wantkind == BOOLEAN: - if not isinstance(have, bool): - match = False - break - - elif wantkind == INTEGER: - if not isinstance(have, int): - match = False - break - - elif wantkind == FLOAT: - if not isinstance(have, float): - match = False - break - - elif wantkind == STRING: - if not isStringType(have): - match = False - break - - elif wanttp != have.__class__.__name__: - match = False - break - - if match: - return funct, argtypes - return None - - def findMethod(self): - has = False - - for meth in self.methods: - fun = MethodParser(meth) - - if fun.name == self.methname: - self.argtypes.append([argtp for argtp, argname in fun.args]) - self.argnames.append([argname for argtp, argname in fun.args]) - self.rtype.append(fun.rtype) - self.fcnname.append(fun.getDecl()) - - has = True - - return has - - def __marshall(self, args, argtypes): - data = TQByteArray() - if argtypes == []: - return data - - params = TQDataStream (data, IO_WriteOnly) - - for arg, (argtype, argkind) in _xiter(args, argtypes): - if argkind == BOOLEAN: - # XXX for now, let bools be handelt like int - dcop_add(params, int(arg), 'int') - - elif argkind in (INTEGER, FLOAT): - dcop_add(params, arg, argtype) - - elif argkind == STRING: - # convert it to the right string type: - if argtype != arg.__class__.__name__: - arg = stringTypesDict[argtype](arg) - - dcop_add(params, arg) - - elif argtype.startswith("TQMap") or argtype.startswith("TQValueList"): - dcop_add(params, arg, argtype) - - # XXX: - # Is 'isinstance(arg, eval(argtype))' really good? - # What if 'argtype' is located in some modul? Like 'qt.TQString'. - # Then this will fail (but it should not!). - # And the worst thing: the eval() will raise a NameError! - # - # On the other hand 'arg.__class__.__name__ == argtype' has the - # disadvantage that it can't be a derived class! - # - # Would no check at all be better?? - # - # But I doubt a derived class would be ok anyway. I have to check - # this in the DCOP-docu, but I think a derived class would not be - # correctly unmarshalled, because a derived class could be marshalled - # in a total different way to it's super-class. - elif arg.__class__.__name__ == argtype: - dcop_add(params, arg) - - else: - raise TypeError, "expected type %s, got type %s." % (argtype, arg.__class__.__name__) - - return data - - def __unmarshall(self, data, type_): - s = TQDataStream(data, IO_ReadOnly) - - if str(type_) in stringTypes: - return unicode(dcop_next(s, type_)) - else: - return dcop_next(s, type_) + """ + An object corresponding to a specific DCOP method owned by a + specific DCOP object. + """ + def __init__(self, dcopObj, name): + self.argtypes = [] + self.argnames = [] + self.fcnname = [] + self.rtype = [] + self.appname = dcopObj.appname + self.objname = dcopObj.objname + self.methname = name + self.client = dcopObj.objclient + try: + self.methods = [meth.data() for meth in dcopObj.objmethods] + except TypeError: + self.methods = [] + self.valid = self.findMethod() + + def __repr__( self ): + return "%s(%s,%s,%s)" % (self.__class__.__name__,repr(self.appname),repr(self.objname),repr(self.methname)) + + def __str__(self): + return repr(self) + + def __call__(self, *args): + return self.dcop_call(args) + + def __iter__(self): + return iter(self.fcnname) + + def dcop_call(self, args): + # method valid? + if not self.valid: + return False, None + + found = self.getMatchingMethod(args) + + if found is None: + return False, None + + meth, argtypes = found + + ok, replyType, replyData = self.client.call(self.appname, self.objname.encode(), meth.encode(), self.__marshall(args,argtypes)) + + if ok: + return ok, self.__unmarshall(replyData, replyType) + else: + return ok, None + + def getMatchingMethod(self,args): + count = len(args) + + for funct, argtypes in _xiter(self.fcnname, self.argtypes): + if len(argtypes) == count: + match = True + + for (wanttp, wantkind), have in _xiter(argtypes,args): + if wantkind == BOOLEAN: + if not isinstance(have, bool): + match = False + break + + elif wantkind == INTEGER: + if not isinstance(have, int): + match = False + break + + elif wantkind == FLOAT: + if not isinstance(have, float): + match = False + break + + elif wantkind == STRING: + if not isStringType(have): + match = False + break + + elif wanttp != have.__class__.__name__: + match = False + break + + if match: + return funct, argtypes + return None + + def findMethod(self): + has = False + + for meth in self.methods: + fun = MethodParser(meth) + + if fun.name == self.methname: + self.argtypes.append([argtp for argtp, argname in fun.args]) + self.argnames.append([argname for argtp, argname in fun.args]) + self.rtype.append(fun.rtype) + self.fcnname.append(fun.getDecl()) + + has = True + + return has + + def __marshall(self, args, argtypes): + data = TQByteArray() + if argtypes == []: + return data + + params = TQDataStream (data, IO_WriteOnly) + + for arg, (argtype, argkind) in _xiter(args, argtypes): + if argkind == BOOLEAN: + # XXX for now, let bools be handelt like int + dcop_add(params, int(arg), b'int') + + elif argkind in (INTEGER, FLOAT): + dcop_add(params, arg, argtype.encode()) + + elif argkind == STRING: + # convert it to the right string type: + if argtype != arg.__class__.__name__: + arg = stringTypesDict[argtype](arg) + + dcop_add(params, arg) + + elif argtype.startswith("TQMap") or argtype.startswith("TQValueList"): + dcop_add(params, arg, argtype) + + # XXX: + # Is 'isinstance(arg, eval(argtype))' really good? + # What if 'argtype' is located in some modul? Like 'qt.TQString'. + # Then this will fail (but it should not!). + # And the worst thing: the eval() will raise a NameError! + # + # On the other hand 'arg.__class__.__name__ == argtype' has the + # disadvantage that it can't be a derived class! + # + # Would no check at all be better?? + # + # But I doubt a derived class would be ok anyway. I have to check + # this in the DCOP-docu, but I think a derived class would not be + # correctly unmarshalled, because a derived class could be marshalled + # in a total different way to it's super-class. + elif arg.__class__.__name__ == argtype: + dcop_add(params, arg) + + else: + raise TypeError("expected type %s, got type %s." % (argtype, arg.__class__.__name__)) + + return data + + def __unmarshall(self, data, type_): + s = TQDataStream(data, IO_ReadOnly) + + if str(type_.data()) in stringTypes: + return dcop_next(s, type_).decode() + else: + return dcop_next(s, type_) diff --git a/importTest.py b/importTest.py index ebe4d37..39a8127 100644 --- a/importTest.py +++ b/importTest.py @@ -1,22 +1,22 @@ -print "\nTesting PyKDE module imports\n" +print("\nTesting PyKDE module imports\n") try: import pytdeconfig except: - print "Can't find pytdeconfig.py - please check installation" + print("Can't find pytdeconfig.py - please check installation") raise pytdecfg = pytdeconfig.Configuration () #modules = ["dcop", "tdecore", "tdesu", "tdefx", "tdeui", "tdeio", "tdefile", "tdeparts", "tdehtml", "kjs", "tdespell", "tdeprint"] -print "Modules built:" -print " ",pytdecfg.pytde_modules -print -print "Importing:" -print +print("Modules built:") +print(" ",pytdecfg.pytde_modules) +print() +print("Importing:") +print() for mod in pytdecfg.pytde_modules.split(): - print mod + print(mod) if mod != "tdesu": exec ("import " + mod) -print +print() @@ -1,6 +1,6 @@ #!/usr/bin/python -import sys, getopt, os, os.path, fnmatch, string, StringIO +import sys, getopt, os, os.path, fnmatch, string, io #---------- globals ---------- @@ -28,7 +28,7 @@ def getOptions (): args = [] if (optlist == []) or (len (args) != 1): - print '\nUsage: postproc -p<path> -o<operation> <filespec>\n' + print('\nUsage: postproc -p<path> -o<operation> <filespec>\n') return FALSE pattern = args [0] @@ -41,13 +41,13 @@ def checkOptions (optlist): for pair in optlist: if (pair [0] == '--path') or (pair [0] == '-p'): if not checkPath (pair [1]): - print '\nPath ' + pair [1] + ' does not exist\n' + print('\nPath ' + pair [1] + ' does not exist\n') else: havePath = TRUE elif (pair [0] == '--op') or (pair [0] == '-o'): if not checkOp (pair [1]): - print '\nOperation ' + pair [1] + ' does not exist\n' + print('\nOperation ' + pair [1] + ' does not exist\n') else: haveOp = TRUE @@ -92,7 +92,7 @@ def trFix (filelist): for fn in filelist: m = open (opPath + fn, 'r') tmpname = os.path.splitext (fn) [0] + '.tmp' - tmp = StringIO.StringIO () + tmp = io.StringIO () buff = m.readlines () m.close () @@ -106,7 +106,7 @@ def trFix (filelist): i = i + 1 # find classname - while (i < nLines) and (not string.find (buff [i], 'PyObject *sipClass_') == 0): + while (i < nLines) and (not buff[i].find('PyObject *sipClass_') == 0): tmp.write (buff [i]) i = i + 1 @@ -135,7 +135,7 @@ def trFix (filelist): while (i < nLines): # skip sipName_qt_tr table entry/write out everything else - if string.find (buff [i], '{sipName_qt_tr') < 0: + if buff[i].find('{sipName_qt_tr') < 0: tmp.write (buff [i]) i = i + 1 @@ -152,7 +152,7 @@ def qtNoTr (filelist): for fn in filelist: m = open (opPath + fn, 'r') tmpname = os.path.splitext (fn) [0] + '.tmp' - tmp = StringIO.StringIO () + tmp = io.StringIO () buff = m.readlines () m.close () @@ -160,7 +160,7 @@ def qtNoTr (filelist): i = 0 nLines = len (buff) - while (i < nLines) and (string.find (buff [i], 'Q_OBJECT') < 0): + while (i < nLines) and (buff[i].find('Q_OBJECT') < 0): tmp.write (buff [i]) i = i + 1 @@ -189,7 +189,7 @@ def shpix (): files = os.listdir (opPath) fn = [] for file in files: - if string.find (file, "tdeuipart") >= 0 and file [-4:] == ".cpp": + if file.find("tdeuipart") >= 0 and file [-4:] == ".cpp": fn.append (file) if not fn: @@ -206,9 +206,9 @@ def shpix (): state = None for ln in range (0, len (buff)): line = buff [ln] - if string.find (line, "sipTDESharedPixmap::resolution") >= 0: + if line.find("sipTDESharedPixmap::resolution") >= 0: state = "res" - elif string.find (line, "sipTDESharedPixmap::setResolution") >= 0: + elif line.find("sipTDESharedPixmap::setResolution") >= 0: state = "setRes" else: state = None @@ -219,9 +219,9 @@ def shpix (): ln = ln + 1 line = buff [ln] if state == "res": - buff [ln] = string.replace (line, "TQPaintDevice::resolution", "KPixmap::resolution") + buff [ln] = line.replace("TQPaintDevice::resolution", "KPixmap::resolution") elif state == "setRes": - buff [ln] = string.replace (line, "TQPaintDevice::setResolution", "KPixmap::setResolution") + buff [ln] = line.replace("TQPaintDevice::setResolution", "KPixmap::setResolution") tmpfile = open (os.path.join (opPath, tmpname), 'w') for line in buff: @@ -244,13 +244,13 @@ def notify (): tmpBuff = [] flag = 0 for line in buff: - if string.find (line, "class KNotify:") >= 0: + if line.find("class KNotify:") >= 0: flag = 1 - elif flag == 1 and string.find (line, "class KNotifyWidgetBase(TQWidget):") >= 0: + elif flag == 1 and line.find("class KNotifyWidgetBase(TQWidget):") >= 0: flag = 2 - elif flag == 2 and string.find (line, "class KNotifyWidget(KNotifyWidgetBase):") >= 0: + elif flag == 2 and line.find("class KNotifyWidget(KNotifyWidgetBase):") >= 0: for ln in tmpBuff: tmpfile.write (ln) flag = 0 @@ -270,7 +270,7 @@ def varhier (filelist): for fn in filelist: m = open (opPath + fn, 'r') tmpname = os.path.splitext (fn) [0] + '.tmp' - tmp = StringIO.StringIO () + tmp = io.StringIO () buff = m.readlines () m.close () @@ -278,11 +278,11 @@ def varhier (filelist): i = 0 nLines = len (buff) - while (i < nLines) and (string.find (buff [i], 'PyMethodDef *sipClassVarHierTab_') < 0): + while (i < nLines) and (buff[i].find('PyMethodDef *sipClassVarHierTab_') < 0): tmp.write (buff [i]) i = i + 1 - while (i < nLines) and (string.find (buff [i], "};") < 0): + while (i < nLines) and (buff[i].find("};") < 0): tmp.write (buff [i]) i = i + 1 @@ -293,7 +293,7 @@ def varhier (filelist): if not flag: tmp.write (buff [i]) - if flag and not ((string.find (buff [i], "};") >= 0) or (string.find (buff [i], "NULL") >= 0)): + if flag and not ((buff[i].find("};") >= 0) or (buff[i].find("NULL") >= 0)): flag = FALSE i = i + 1 @@ -312,7 +312,7 @@ def appQuit (filelist): for fn in filelist: m = open (opPath + fn, 'r') tmpname = os.path.splitext (fn) [0] + '.tmp' - tmp = StringIO.StringIO () + tmp = io.StringIO () buff = m.readlines () m.close () @@ -320,20 +320,20 @@ def appQuit (filelist): i = 0 nLines = len (buff) - while (i < nLines) and (string.find (buff [i], 'import libsip') < 0): + while (i < nLines) and (buff[i].find('import libsip') < 0): tmp.write (buff [i]) i = i + 1 tmp.write (buff [i] + "\nfrom PyTQt.qt import TQCloseEvent") i = i + 1 - while (i < nLines) and (string.find (buff [i], "class TDEApplication") < 0): + while (i < nLines) and (buff[i].find("class TDEApplication") < 0): tmp.write (buff [i]) i = i + 1 count = 0 while count < 2: - while (i < nLines) and (string.find (buff [i], "return") < 0): + while (i < nLines) and (buff[i].find("return") < 0): tmp.write (buff [i]) i = i + 1 @@ -408,9 +408,9 @@ def fixSignal (filelist): count = 0 for line in m: if count < times: - if string.find (line, "proxySlot(unsigned long)") > 0\ - or string.find (line, "proxySlot(unsigned long a0)") > 0: - line = string.replace (line, "unsigned long", "WId") + if line.find("proxySlot(unsigned long)") > 0\ + or line.find("proxySlot(unsigned long a0)") > 0: + line = line.replace("unsigned long", "WId") count = count + 1 n.write (line) @@ -439,13 +439,13 @@ def kjsfix (filelist): purevirt = ["toPrimitive", "toBoolean", "toNumber", "toString", "toObject"] while (i < nLines): - if string.find (buff [i], "KJS::ExecState") >= 0: + if buff[i].find("KJS::ExecState") >= 0: for pv in purevirt: - if string.find (buff [i], pv) >= 0: + if buff[i].find(pv) >= 0: i = i + 2 buff [i] = "\t\treturn KJS::ObjectImp::%s(a0);" % pv i = i + 1 - while string.find (buff [i], "}") < 0: + while buff[i].find("}") < 0: buff [i] = "" i = i + 1 break @@ -474,37 +474,37 @@ if operation != "shpix": if operation == "tr": if not trFix (filelist): - print 'operation error -- tr' + print('operation error -- tr') sys.exit (-1) elif operation == 'qtNoTr': if not qtNoTr (filelist): - print 'operation error -- qtNoTr' + print('operation error -- qtNoTr') sys.exit (-1) elif operation == 'shpix': if not shpix (): - print 'operation error -- shpix' + print('operation error -- shpix') sys.exit (-1) elif operation == "notify": if not notify (): - print "operation error -- notify" + print("operation error -- notify") sys.exit (-1) elif operation == "varhier": if not varhier (filelist): - print "operation error -- varhier" + print("operation error -- varhier") sys.exit (-1) elif operation == "appQuit": if not appQuit (filelist): - print "operation error -- appQuit" + print("operation error -- appQuit") sys.exit (-1) elif operation == "kjsfix": if not kjsfix (filelist): - print "operation error -- kjsfix" + print("operation error -- kjsfix") sys.exit (-1) elif operation == "fixTQVariant": @@ -514,7 +514,7 @@ elif operation == "fixTQVariant": elif operation == "fixSignal": if not fixSignal (filelist): - print "operation error -- fixSignal" + print("operation error -- fixSignal") sys.exit (-1) sys.exit (0) diff --git a/pytde350.prj b/pytde350.prj index 8f0873d..f838a79 100644 --- a/pytde350.prj +++ b/pytde350.prj @@ -51,7 +51,7 @@ subst = $DST/extra/kde350 import = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11) importpath = $IMP sipslot = callBackObj callBackSlot dcopClient -include = ../extra/kde350/dcop +include = ./extra/kde350/dcop libs = -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP define = "KDE_DEPRECATED", "" define = "DCOP_EXPORT", "" @@ -184,7 +184,7 @@ import = tdeui importpath = $IMP amend = * ctor parent /TransferThis/ amend = * all parent /Transfer/ -include = ../extra/kde350/tdeio @KDE_INCLUDEPATH@/tdeio ../tdecore +include = ./extra/kde350/tdeio @KDE_INCLUDEPATH@/tdeio ../tdecore libs = -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeio -ltdeui -ltdecore -ldcopcmodule\ -ltdecorecmodule -ltdeuicmodule sipslot = diff --git a/pytde351.prj b/pytde351.prj index 31d0b54..c0a9bab 100644 --- a/pytde351.prj +++ b/pytde351.prj @@ -51,7 +51,7 @@ subst = $DST/extra/kde351 import = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11) importpath = $IMP sipslot = callBackObj callBackSlot dcopClient -include = ../extra/kde351/dcop +include = ./extra/kde351/dcop libs = -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP define = "KDE_DEPRECATED", "" define = "DCOP_EXPORT", "" @@ -184,7 +184,7 @@ import = tdeui importpath = $IMP amend = * ctor parent /TransferThis/ amend = * all parent /Transfer/ -include = ../extra/kde351/tdeio @KDE_INCLUDEPATH@/tdeio ../tdecore +include = ./extra/kde351/tdeio @KDE_INCLUDEPATH@/tdeio ../tdecore libs = -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeio -ltdeui -ltdecore -ldcopcmodule\ -ltdecorecmodule -ltdeuicmodule sipslot = diff --git a/pytde352.prj b/pytde352.prj index c3f5681..3362696 100644 --- a/pytde352.prj +++ b/pytde352.prj @@ -51,7 +51,7 @@ subst = $DST/extra/kde352 import = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11) importpath = $IMP sipslot = callBackObj callBackSlot dcopClient -include = ../extra/kde352/dcop +include = ./extra/kde352/dcop libs = -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP define = "KDE_DEPRECATED", "" define = "DCOP_EXPORT", "" @@ -184,7 +184,7 @@ import = tdeui importpath = $IMP amend = * ctor parent /TransferThis/ amend = * all parent /Transfer/ -include = ../extra/kde352/tdeio @KDE_INCLUDEPATH@/tdeio ../tdecore +include = ./extra/kde352/tdeio @KDE_INCLUDEPATH@/tdeio ../tdecore libs = -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeio -ltdeui -ltdecore -ldcopcmodule\ -ltdecorecmodule -ltdeuicmodule sipslot = diff --git a/pytde353.prj b/pytde353.prj index 057a946..705af1e 100644 --- a/pytde353.prj +++ b/pytde353.prj @@ -51,7 +51,7 @@ subst = $DST/extra/kde353 import = qtmod.sip (TQt_3_0_0 TQt_4_0_0 WS_X11) importpath = $IMP sipslot = callBackObj callBackSlot dcopClient -include = ../extra/kde353/dcop +include = ./extra/kde353/dcop libs = -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP define = "KDE_DEPRECATED", "" define = "DCOP_EXPORT", "" @@ -184,7 +184,7 @@ import = tdeui importpath = $IMP amend = * ctor parent /TransferThis/ amend = * all parent /Transfer/ -include = ../extra/kde353/tdeio @KDE_INCLUDEPATH@/tdeio ../tdecore +include = ./extra/kde353/tdeio @KDE_INCLUDEPATH@/tdeio ../tdecore libs = -L@BL_TDEDIR@ -lsip -lqtcmodule -lDCOP -ltdeio -ltdeui -ltdecore -ldcopcmodule\ -ltdecorecmodule -ltdeuicmodule sipslot = diff --git a/sip/dcop/dcopclient.sip b/sip/dcop/dcopclient.sip index 35503d2..3edba91 100644 --- a/sip/dcop/dcopclient.sip +++ b/sip/dcop/dcopclient.sip @@ -88,7 +88,7 @@ public: virtual bool process (const TQCString&, const TQByteArray&, TQCString&, TQByteArray&); DCOPClientTransaction* beginTransaction (); void endTransaction (DCOPClientTransaction*, TQCString&, TQByteArray&); - TQ_INT32 transactionId (); + TQ_INT32 transactionId (); bool isApplicationRegistered (const TQCString&); QCStringList registeredApplications (); QCStringList remoteObjects (const TQCString&, bool* = 0); @@ -96,10 +96,10 @@ public: QCStringList remoteFunctions (const TQCString&, const TQCString&, bool* = 0); bool receive (const TQCString&, const TQCString&, const TQCString&, const TQByteArray&, TQCString& /Out/, TQByteArray& /Out/); bool find (const TQCString&, const TQCString&, const TQCString&, const TQByteArray&, TQCString& /Out/, TQByteArray& /Out/); - static TQCString normalizeFunctionSignature (const TQCString&); - TQCString senderId () const; + static TQCString normalizeFunctionSignature (const TQCString&); + TQCString senderId () const; void setDefaultObject (const TQCString&); - TQCString defaultObject () const; + TQCString defaultObject () const; void setNotifications (bool); void setDaemonMode (bool); diff --git a/sip/tdecore/bytearray.sip b/sip/tdecore/bytearray.sip index 743aff6..046939b 100644 --- a/sip/tdecore/bytearray.sip +++ b/sip/tdecore/bytearray.sip @@ -141,7 +141,7 @@ void dcop_next (TQDataStream&, TQCString&); { TQ_INT8 res; *a0 >> res; - return PyInt_FromLong ((long)res); + return PyLong_FromLong ((long)res); } else if (*a1 == "bool") { @@ -153,7 +153,7 @@ void dcop_next (TQDataStream&, TQCString&); { int res; *a0 >> res; - return PyInt_FromLong ((long)res); + return PyLong_FromLong ((long)res); } else if (*a1 == "long") { @@ -165,19 +165,19 @@ void dcop_next (TQDataStream&, TQCString&); { short res; *a0 >> res; - return PyInt_FromLong ((long)res); + return PyLong_FromLong ((long)res); } if (*a1 == "uchar" || *a1 == "unsigned char") { TQ_UINT8 res; *a0 >> res; - return PyInt_FromLong ((long)res); + return PyLong_FromLong ((long)res); } else if (*a1 == "uint" || *a1 == "unsigned int") { unsigned int res; *a0 >> res; - return PyInt_FromLong ((long)res); + return PyLong_FromLong ((long)res); } else if (*a1 == "ulong" || *a1 == "unsigned long") { @@ -201,7 +201,7 @@ void dcop_next (TQDataStream&, TQCString&); { unsigned short res; *a0 >> res; - return PyInt_FromLong ((long)res); + return PyLong_FromLong ((long)res); } else if (*a1 == "float") { @@ -315,7 +315,7 @@ void dcop_next (TQDataStream&, TQCString&); { unsigned int res; *a0 >> res; - return PyInt_FromLong ((long)res); + return PyLong_FromLong ((long)res); } else if (*a1 == "DCOPRef") { diff --git a/sip/tdecore/kcalendarsystemfactory.sip b/sip/tdecore/kcalendarsystemfactory.sip index 1146e5f..665b6b1 100644 --- a/sip/tdecore/kcalendarsystemfactory.sip +++ b/sip/tdecore/kcalendarsystemfactory.sip @@ -35,7 +35,7 @@ class KCalendarSystemFactory public: KCalendarSystemFactory (); - static KCalendarSystem* create (const TQString& = TQString ::fromLatin1 ("gregorian" ), const TDELocale* = 0); + static KCalendarSystem* create (const TQString& = TQString ::fromUtf8 ("gregorian" ), const TDELocale* = 0); static TQStringList calendarSystems (); }; // class KCalendarSystemFactory diff --git a/sip/tdecore/kcompletion.sip b/sip/tdecore/kcompletion.sip index 223e230..a19fc24 100644 --- a/sip/tdecore/kcompletion.sip +++ b/sip/tdecore/kcompletion.sip @@ -175,7 +175,7 @@ protected: for (it = map.begin (); it != map.end (); ++it) { - key = PyInt_FromLong ((int) it.key ()); + key = PyLong_FromLong ((int) it.key ()); value = sipConvertFromInstance ((void *)&(it.data ()), sipClass_TDEShortcut, sipTransferObj); if ((value == NULL) || (PyDict_SetItem (dict, key, value) < 0)) { @@ -208,14 +208,14 @@ protected: { cValue = (TDEShortcut *)sipForceConvertToType(value, sipType_TDEShortcut, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); - if (iserr || !PyInt_Check (key)) + if (iserr || !PyLong_Check (key)) { *sipIsErr = 1; delete kbmap; return 0; } - kbmap->insert ((TDECompletionBase::KeyBindingType)PyInt_AS_LONG (key), *cValue); + kbmap->insert ((TDECompletionBase::KeyBindingType)PyLong_AS_LONG (key), *cValue); } *sipCppPtr = kbmap; diff --git a/sip/tdecore/klockfile.sip b/sip/tdecore/klockfile.sip index fe3bc95..2e067ee 100644 --- a/sip/tdecore/klockfile.sip +++ b/sip/tdecore/klockfile.sip @@ -91,7 +91,7 @@ public: // Convert a Python instance to a Ptr on the heap. if (sipIsErr == NULL) - return PyInstance_Check(sipPy); + return PyType_Check(sipPy); int iserr = 0; TDELockFile *cpp = (TDELockFile *)sipForceConvertToType(sipPy, sipType_TDELockFile, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); diff --git a/sip/tdecore/kmacroexpander.sip b/sip/tdecore/kmacroexpander.sip index 7f2b3d2..bb3a39d 100644 --- a/sip/tdecore/kmacroexpander.sip +++ b/sip/tdecore/kmacroexpander.sip @@ -143,7 +143,7 @@ TQString expandMacrosShellQuote (const TQString&, const TQMap<TQStr for (it = map.begin (); it != map.end (); ++it) { TQChar acpp = it.key (); - PyObject *binst = PyString_FromString ((char *)((TQString *)&it.data ())); + PyObject *binst = SIPBytes_FromString ((char *)((TQString *)&it.data ())); PyObject *ainst; if (((ainst = sipConvertFromNewType(new TQChar(acpp), sipType_TQChar, sipTransferObj)) == NULL) || (binst == NULL) @@ -232,7 +232,7 @@ TQString expandMacrosShellQuote (const TQString&, const TQMap<TQStr for (it = map.begin (); it != map.end (); ++it) { TQStringList bcpp = it.data (); - PyObject *ainst = PyString_FromString ((char *)((TQString *)&it.key ())); + PyObject *ainst = SIPBytes_FromString ((char *)((TQString *)&it.key ())); PyObject *binst; if (((binst = sipConvertFromNewType(new TQStringList(bcpp), sipType_TQStringList, sipTransferObj)) == NULL) || (ainst == NULL) diff --git a/sip/tdecore/kmountpoint.sip b/sip/tdecore/kmountpoint.sip index 76a6c85..066b1e6 100644 --- a/sip/tdecore/kmountpoint.sip +++ b/sip/tdecore/kmountpoint.sip @@ -92,7 +92,7 @@ private: // Convert a Python instance to a Ptr on the heap. if (sipIsErr == NULL) - return PyInstance_Check(sipPy); + return PyType_Check(sipPy); int iserr = 0; KMountPoint *cpp = (KMountPoint *)sipForceConvertToType(sipPy, sipType_KMountPoint, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); diff --git a/sip/tdecore/kprocess.sip b/sip/tdecore/kprocess.sip index e60abd4..a728539 100644 --- a/sip/tdecore/kprocess.sip +++ b/sip/tdecore/kprocess.sip @@ -235,7 +235,7 @@ public: for (int i = 0; i < PyList_Size (a0); i++) { elem = PyList_GET_ITEM (a0, i); - *sipCpp << PyString_AsString (elem); + *sipCpp << sipBytes_AsString (elem); } diff --git a/sip/tdecore/ksavefile.sip b/sip/tdecore/ksavefile.sip index f9e917b..e5e2dc1 100644 --- a/sip/tdecore/ksavefile.sip +++ b/sip/tdecore/ksavefile.sip @@ -44,7 +44,7 @@ public: bool close (); %If ( KDE_3_2_0 - ) - static bool backupFile (const TQString&, const TQString& = TQString ::null , const TQString& = TQString ::fromLatin1 ("~" )); + static bool backupFile (const TQString&, const TQString& = TQString ::null , const TQString& = TQString ::fromUtf8 ("~" )); %End diff --git a/sip/tdecore/ktimezones.sip b/sip/tdecore/ktimezones.sip index 1f9e612..7876587 100644 --- a/sip/tdecore/ktimezones.sip +++ b/sip/tdecore/ktimezones.sip @@ -159,7 +159,7 @@ private: // Convert a Python instance to a Ptr on the heap. if (sipIsErr == NULL) - return PyInstance_Check(sipPy); + return PyType_Check(sipPy); int iserr = 0; KTimezoneSource *cpp = (KTimezoneSource *)sipForceConvertToType(sipPy, sipType_KTimezoneSource, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); diff --git a/sip/tdecore/kurl.sip b/sip/tdecore/kurl.sip index 495f3f4..652cee1 100644 --- a/sip/tdecore/kurl.sip +++ b/sip/tdecore/kurl.sip @@ -60,53 +60,53 @@ public: KURL (const KURL&); KURL (const TQUrl&); KURL (const KURL&, const TQString&, int = 0); - TQString protocol () const; + TQString protocol () const; void setProtocol (const TQString&); %If ( KDE_3_2_0 - ) int uriMode () const; %End - TQString user () const; + TQString user () const; void setUser (const TQString&); bool hasUser () const; - TQString pass () /PyName=pass_/; + TQString pass () /PyName=pass_/; void setPass (const TQString&); bool hasPass () const; - TQString host () const; + TQString host () const; void setHost (const TQString&); bool hasHost () const; ushort port () const; void setPort (ushort); - TQString path () const; - TQString path (int) const; + TQString path () const; + TQString path (int) const; void setPath (const TQString&); bool hasPath () const; void cleanPath (bool = 0); void adjustPath (int); void setEncodedPathAndQuery (const TQString&, int = 0); void setEncodedPath (const TQString&, int = 0); - TQString encodedPathAndQuery (int = 0, bool = 0, int = 0) const; + TQString encodedPathAndQuery (int = 0, bool = 0, int = 0) const; void setQuery (const TQString&, int = 0); - TQString query () const; - TQString ref () const; + TQString query () const; + TQString ref () const; void setRef (const TQString&); bool hasRef () const; - TQString htmlRef () const; - TQString encodedHtmlRef () const; + TQString htmlRef () const; + TQString encodedHtmlRef () const; void setHTMLRef (const TQString&); bool hasHTMLRef () const; bool isValid () const; bool isMalformed () const; bool isLocalFile () const; void setFileEncoding (const TQString&); - TQString fileEncoding () const; + TQString fileEncoding () const; bool hasSubURL () const; void addPath (const TQString&); - TQString queryItem (const TQString&) const; + TQString queryItem (const TQString&) const; %If ( KDE_3_2_0 - ) - TQString queryItem (const TQString&, int) const; + TQString queryItem (const TQString&, int) const; %End @@ -117,10 +117,10 @@ public: CaseInsensitiveKeys }; - TQMap<TQString,TQString> queryItems (int = 0) const; + TQMap<TQString, TQString> queryItems (int = 0) const; %If ( KDE_3_2_0 - ) - TQMap<TQString,TQString> queryItems (int, int) const; + TQMap<TQString, TQString> queryItems (int, int) const; %End void addQueryItem (const TQString&, const TQString&, int = 0); @@ -128,25 +128,25 @@ public: %End void setFileName (const TQString&); - TQString fileName (bool = 1) const; - TQString directory (bool = 1, bool = 1) const; + TQString fileName (bool = 1) const; + TQString directory (bool = 1, bool = 1) const; %If ( KDE_3_2_0 - ) void setDirectory (const TQString&); %End bool cd (const TQString&); - TQString url (int = 0, int = 0) const; - TQString prettyURL (int = 0) const; - TQString prettyURL (int, KURL::AdjustementFlags) const; + TQString url (int = 0, int = 0) const; + TQString prettyURL (int = 0) const; + TQString prettyURL (int, KURL::AdjustementFlags) const; %If ( KDE_3_4_0 - ) - TQString pathOrURL () const; + TQString pathOrURL () const; %End %If ( KDE_3_0_1 - ) - TQString htmlURL () const; + TQString htmlURL () const; %End bool isEmpty () const; @@ -179,18 +179,18 @@ public: static KURL fromPathOrURL (const TQString&); %End - static TQString encode_string (const TQString&, int = 0); - static TQString encode_string_no_slash (const TQString&, int = 0); - static TQString decode_string (const TQString&, int = 0); + static TQString encode_string (const TQString&, int = 0); + static TQString encode_string_no_slash (const TQString&, int = 0); + static TQString decode_string (const TQString&, int = 0); static bool isRelativeURL (const TQString&); %If ( KDE_3_2_0 - ) - static TQString relativeURL (const KURL&, const KURL&, int = 0); - static TQString relativePath (const TQString&, const TQString&, bool* = 0); + static TQString relativeURL (const KURL&, const KURL&, int = 0); + static TQString relativePath (const TQString&, const TQString&, bool* = 0); static KURL::URIMode uriModeForProtocol (const TQString&); %End - TQString filename (bool = 1) const; + TQString filename (bool = 1) const; protected: void reset (); diff --git a/sip/tdecore/kuser.sip b/sip/tdecore/kuser.sip index e16a93e..4ad5504 100644 --- a/sip/tdecore/kuser.sip +++ b/sip/tdecore/kuser.sip @@ -29,7 +29,7 @@ class KUser { %TypeHeaderCode -#include <../extra/kde320/ksharedptr.h> +#include <../../extra/kde320/ksharedptr.h> #include <kuser.h> %End diff --git a/sip/tdecore/netwm.sip b/sip/tdecore/netwm.sip index 48dcbbf..ac27f60 100644 --- a/sip/tdecore/netwm.sip +++ b/sip/tdecore/netwm.sip @@ -52,7 +52,7 @@ public: unsigned long *list = new unsigned long [count]; for (int i = 0; i < count; i++) - list [i] = (unsigned long)PyInt_AS_LONG (PyList_GET_ITEM (a2, i)); + list [i] = (unsigned long)PyLong_AS_LONG (PyList_GET_ITEM (a2, i)); Py_BEGIN_ALLOW_THREADS Display *d = tqt_xdisplay (); @@ -83,7 +83,7 @@ public: unsigned long *list = new unsigned long [count]; for (int i = 0; i < count; i++) - list [i] = (unsigned long)PyInt_AS_LONG (PyList_GET_ITEM (a2, i)); + list [i] = (unsigned long)PyLong_AS_LONG (PyList_GET_ITEM (a2, i)); Py_BEGIN_ALLOW_THREADS Display *d = tqt_xdisplay (); @@ -369,7 +369,7 @@ public: unsigned long *list = new unsigned long [count]; for (int i = 0; i < count; i++) - list [i] = (unsigned long)PyInt_AS_LONG (PyList_GET_ITEM (a2, i)); + list [i] = (unsigned long)PyLong_AS_LONG (PyList_GET_ITEM (a2, i)); Py_BEGIN_ALLOW_THREADS Display *d = tqt_xdisplay (); @@ -410,7 +410,7 @@ public: unsigned long *list = new unsigned long [count]; for (int i = 0; i < count; i++) - list [i] = (unsigned long)PyInt_AS_LONG (PyList_GET_ITEM (a2, i)); + list [i] = (unsigned long)PyLong_AS_LONG (PyList_GET_ITEM (a2, i)); Py_BEGIN_ALLOW_THREADS Display *d = tqt_xdisplay (); @@ -449,7 +449,7 @@ public: unsigned long *list = new unsigned long [count]; for (int i = 0; i < count; i++) - list [i] = (unsigned long)PyInt_AS_LONG (PyList_GET_ITEM (a2, i)); + list [i] = (unsigned long)PyLong_AS_LONG (PyList_GET_ITEM (a2, i)); Py_BEGIN_ALLOW_THREADS Display *d = tqt_xdisplay (); @@ -494,7 +494,7 @@ public: unsigned long *list = new unsigned long [count]; for (int i = 0; i < count; i++) - list [i] = (unsigned long)PyInt_AS_LONG (PyList_GET_ITEM (a2, i)); + list [i] = (unsigned long)PyLong_AS_LONG (PyList_GET_ITEM (a2, i)); Py_BEGIN_ALLOW_THREADS Display *d = tqt_xdisplay (); diff --git a/sip/tdecore/tdeaccel.sip b/sip/tdecore/tdeaccel.sip index 4ad90cf..15875a1 100644 --- a/sip/tdecore/tdeaccel.sip +++ b/sip/tdecore/tdeaccel.sip @@ -183,8 +183,8 @@ public: for (it = map.begin (); it != map.end (); ++it) { - PyObject *iKey = PyInt_FromLong (((long) it.key ())); - PyObject *sData = PyString_FromString ((char *)((TQString *)&it.data ())); + PyObject *iKey = PyLong_FromLong (((long) it.key ())); + PyObject *sData = SIPBytes_FromString ((char *)((TQString *)&it.data ())); if ((iKey == NULL) || (sData == NULL) || (PyDict_SetItem (dict, iKey, sData) < 0)) { @@ -216,7 +216,7 @@ public: { int iserr = 0, sData_state; - iKey = PyInt_AS_LONG (key); + iKey = PyLong_AS_LONG (key); sData = (TQString *)sipForceConvertToType(value, sipType_TQString, sipTransferObj, SIP_NOT_NONE, &sData_state, &iserr); if (iserr) diff --git a/sip/tdecore/tdeapplication.sip b/sip/tdecore/tdeapplication.sip index 1f568a8..4f167b4 100644 --- a/sip/tdecore/tdeapplication.sip +++ b/sip/tdecore/tdeapplication.sip @@ -400,10 +400,9 @@ typedef ulong Atom; // Convert a Python argv list to a conventional C argc count and argv array. char **pyArgvToC(PyObject *argvlist,int *argcp) { - int argc; char **argv; - argc = PyList_Size(argvlist); + int argc = PyList_Size(argvlist); // Allocate space for two copies of the argument pointers, plus the // terminating NULL. @@ -413,22 +412,30 @@ char **pyArgvToC(PyObject *argvlist,int *argcp) // Convert the list. for (int a = 0; a < argc; ++a) { - char *arg; - - // Get the argument and allocate memory for it. - if ((arg = PyString_AsString(PyList_GetItem(argvlist,a))) == NULL || - (argv[a] = (char *)sipMalloc(strlen(arg) + 1)) == NULL) - return NULL; + PyObject *argObject = PyList_GET_ITEM(argvlist, a); + char *arg; + + if (PyUnicode_Check(argObject)) + { + arg = tqstrdup(sipString_AsUTF8String(&argObject)); + } + else if (SIPBytes_Check(argObject)) + { + arg = tqstrdup(SIPBytes_AS_STRING(argObject)); + } + else + { + return NULL; + } - // Copy the argument and save a pointer to it. - strcpy(argv[a],arg); - argv[a + argc + 1] = argv[a]; + argv[a] = argv[a + argc + 1] = arg; } - argv[argc + argc + 1] = argv[argc] = NULL; - - *argcp = argc; - + argv[argc] = argv[argc + argc + 1] = NULL; + if (argcp) + { + *argcp = argc; + } return argv; } diff --git a/sip/tdecore/tdecmdlineargs.sip b/sip/tdecore/tdecmdlineargs.sip index 6b50c7e..954d2d1 100644 --- a/sip/tdecore/tdecmdlineargs.sip +++ b/sip/tdecore/tdecmdlineargs.sip @@ -168,18 +168,34 @@ public: goto errorExit; member = PyTuple_GET_ITEM (tuple, 0); - if (PyString_Check (member)) - opts [i].name = PyString_AS_STRING (member); + if (PyUnicode_Check(member)) + { + opts[i].name= tqstrdup(sipString_AsUTF8String(&member)); + } + else if (SIPBytes_Check(member)) + { + opts[i].name= tqstrdup(SIPBytes_AS_STRING(member)); + } else + { goto errorExit; + } if (tsz > 1) { member = PyTuple_GET_ITEM (tuple, 1); - if PyString_Check (member) - opts [i].description = PyString_AS_STRING (member); + if (PyUnicode_Check(member)) + { + opts[i].description= tqstrdup(sipString_AsUTF8String(&member)); + } + else if (SIPBytes_Check(member)) + { + opts[i].description= tqstrdup(SIPBytes_AS_STRING(member)); + } else - goto errorExit; + { + goto errorExit; + } } else opts [i].description = NULL; @@ -188,10 +204,18 @@ public: if (tsz > 2) { member = PyTuple_GET_ITEM (tuple, 2); - if PyString_Check (member) - opts [i].def = PyString_AS_STRING (member); + if (PyUnicode_Check(member)) + { + opts[i].def= tqstrdup(sipString_AsUTF8String(&member)); + } + else if (SIPBytes_Check(member)) + { + opts[i].def= tqstrdup(SIPBytes_AS_STRING(member)); + } else - goto errorExit; + { + goto errorExit; + } } else opts [i].def = NULL; @@ -201,9 +225,9 @@ public: } // mark the end of the list - opts [n].name = NULL; - opts [n].description = NULL; - opts [n].def = NULL; + opts[n].name = NULL; + opts[n].description = NULL; + opts[n].def = NULL; Py_BEGIN_ALLOW_THREADS TDECmdLineArgs::addCmdLineOptions (opts, a1, a2, a3); diff --git a/sip/tdecore/tdeconfig.sip b/sip/tdecore/tdeconfig.sip index f93133f..c955aaa 100644 --- a/sip/tdecore/tdeconfig.sip +++ b/sip/tdecore/tdeconfig.sip @@ -217,7 +217,7 @@ private: // Convert a Python instance to a Ptr on the heap. if (sipIsErr == NULL) - return PyInstance_Check(sipPy); + return PyType_Check(sipPy); int iserr = 0; TDESharedConfig *cpp = (TDESharedConfig *)sipForceConvertToType(sipPy, sipType_TDESharedConfig, sipTransferObj, SIP_NO_CONVERTORS, NULL, &iserr); diff --git a/sip/tdecore/tdeconfigbase.sip b/sip/tdecore/tdeconfigbase.sip index 53b36a2..8b0d147 100644 --- a/sip/tdecore/tdeconfigbase.sip +++ b/sip/tdecore/tdeconfigbase.sip @@ -277,15 +277,13 @@ protected: %ConvertToTypeCode if (sipIsErr == NULL) - return PyLong_Check (sipPy) || PyInt_Check (sipPy); + return PyLong_Check (sipPy); long long *ll = new long long; *ll = 0; if (PyLong_Check (sipPy)) *ll = PyLong_AsLongLong (sipPy); - else if (PyInt_Check (sipPy)) - *ll = (long long)PyInt_AS_LONG (sipPy); *sipCppPtr = ll; @@ -313,15 +311,13 @@ protected: %ConvertToTypeCode if (sipIsErr == NULL) - return PyLong_Check (sipPy) || PyInt_Check (sipPy); + return PyLong_Check (sipPy); unsigned long long *ul = new unsigned long long; *ul = 0; if (PyLong_Check (sipPy)) *ul = PyLong_AsUnsignedLongLong (sipPy); - else if (PyInt_Check (sipPy)) - *ul = (unsigned long long)PyInt_AS_LONG (sipPy); *sipCppPtr = ul; diff --git a/sip/tdecore/tdeconfigskeleton.sip b/sip/tdecore/tdeconfigskeleton.sip index c36e13c..4ebd337 100644 --- a/sip/tdecore/tdeconfigskeleton.sip +++ b/sip/tdecore/tdeconfigskeleton.sip @@ -133,7 +133,7 @@ public: { public: - ItemPassword (const TQString&, const TQString&, TQString&, const TQString& = TQString ::fromLatin1 ("" )); + ItemPassword (const TQString&, const TQString&, TQString&, const TQString& = TQString ::fromUtf8 ("" )); }; // class ItemPassword @@ -234,9 +234,9 @@ public: void setCurrentGroup (const TQString&); TQString currentGroup (); void addItem (TDEConfigSkeletonItem*, const TQString& = TQString ::null ); - ItemString* addItemString (const TQString&, TQString&, const TQString& = TQString ::fromLatin1 ("" ), const TQString& = TQString ::null ); - TDEConfigSkeleton::ItemPassword* addItemPassword (const TQString&, TQString&, const TQString& = TQString ::fromLatin1 ("" ), const TQString& = TQString ::null ); - TDEConfigSkeleton::ItemPath* addItemPath (const TQString&, TQString&, const TQString& = TQString ::fromLatin1 ("" ), const TQString& = TQString ::null ); + ItemString* addItemString (const TQString&, TQString&, const TQString& = TQString ::fromUtf8 ("" ), const TQString& = TQString ::null ); + TDEConfigSkeleton::ItemPassword* addItemPassword (const TQString&, TQString&, const TQString& = TQString ::fromUtf8 ("" ), const TQString& = TQString ::null ); + TDEConfigSkeleton::ItemPath* addItemPath (const TQString&, TQString&, const TQString& = TQString ::fromUtf8 ("" ), const TQString& = TQString ::null ); ItemProperty* addItemProperty (const TQString&, TQVariant&, const TQVariant& = TQVariant (), const TQString& = TQString ::null ); ItemBool* addItemBool (const TQString&, bool&, bool = 0, const TQString& = TQString ::null ); %MethodCode @@ -437,7 +437,7 @@ public: Path }; - ItemString (const TQString&, const TQString&, TQString&, const TQString& = TQString ::fromLatin1 ("" ), TDEConfigSkeleton::ItemString::Type = TDEConfigSkeleton ::ItemString ::Normal ); + ItemString (const TQString&, const TQString&, TQString&, const TQString& = TQString ::fromUtf8 ("" ), TDEConfigSkeleton::ItemString::Type = TDEConfigSkeleton ::ItemString ::Normal ); void setValue (const TQString&); TQString& value (); virtual void setDefaultValue (const TQString&); diff --git a/sip/tdecore/twinmodule.sip b/sip/tdecore/twinmodule.sip index 43bf79f..46de544 100644 --- a/sip/tdecore/twinmodule.sip +++ b/sip/tdecore/twinmodule.sip @@ -114,7 +114,7 @@ protected: for( it = cpplist->begin(); it != cpplist->end(); ++it ) { WId cpp = *it; - if (PyList_Append (pylist, PyInt_FromLong ((int) cpp)) < 0) + if (PyList_Append (pylist, PyLong_FromLong ((int) cpp)) < 0) { Py_DECREF (pylist); return NULL; @@ -138,7 +138,7 @@ protected: for (int i = 0; i < PyList_Size (sipPy); i++) { elem = PyList_GET_ITEM (sipPy, i); - cpp = (WId) PyInt_AS_LONG (elem); + cpp = (WId) PyLong_AS_LONG (elem); if (iserr) { *sipIsErr = 1; diff --git a/sip/tdeio/authinfo.sip b/sip/tdeio/authinfo.sip index e4f3a97..95ff7da 100644 --- a/sip/tdeio/authinfo.sip +++ b/sip/tdeio/authinfo.sip @@ -151,7 +151,7 @@ typedef TQMap<TQString, TQStringList> KStringListMap; for (it = map.begin (); it != map.end (); ++it) { - PyObject *sKey = PyString_FromString ((const char *)((TQString)it.key ())); + PyObject *sKey = SIPBytes_FromString ((const char *)((TQString)it.key ())); PyObject *sData = sipConvertFromInstance ((void *)&it.data (), sipClass_TQStringList, sipTransferObj); if ((sKey == NULL) || (sData == NULL) || (PyDict_SetItem (dict, sKey, sData) < 0)) diff --git a/sip/tdeio/kacl.sip b/sip/tdeio/kacl.sip index 2156e3b..31059f0 100644 --- a/sip/tdeio/kacl.sip +++ b/sip/tdeio/kacl.sip @@ -152,7 +152,7 @@ typedef ACLUserPermissionsList ACLGroupPermissionsList; delete cpplist; return 0; } - ushort p2 = (ushort)(PyInt_AS_LONG (PyTuple_GET_ITEM (elem, 1))); + ushort p2 = (ushort)(PyLong_AS_LONG (PyTuple_GET_ITEM (elem, 1))); cpplist->append (ACLUserPermissions (*p1, p2)); diff --git a/sip/tdeio/kservicetype.sip b/sip/tdeio/kservicetype.sip index 7d261b8..5d093e7 100644 --- a/sip/tdeio/kservicetype.sip +++ b/sip/tdeio/kservicetype.sip @@ -155,7 +155,7 @@ protected: TQString acpp = it.key (); int bcpp = (int) it.data (); PyObject *ainst; - PyObject *binst = PyInt_FromLong (bcpp); + PyObject *binst = PyLong_FromLong (bcpp); if (((ainst = sipConvertFromNewType(new TQString (acpp), sipType_TQString, sipTransferObj)) == NULL) || (PyDict_SetItem (dict, ainst, binst) < 0)) { @@ -189,7 +189,7 @@ protected: acpp = (TQString *)sipForceConvertToType(aelem, sipType_TQString, sipTransferObj, SIP_NOT_NONE, &acpp_state, &iserr); - if (iserr || !PyInt_Check(belem)) + if (iserr || !PyLong_Check(belem)) { if (acpp_state) sipReleaseType(acpp, sipType_TQString, acpp_state); @@ -199,7 +199,7 @@ protected: return 0; } - bcpp = (TQVariant::Type) PyInt_AS_LONG(belem); + bcpp = (TQVariant::Type) PyLong_AS_LONG(belem); cppmap->insert (*acpp, bcpp); diff --git a/sip/tdemdi/tdemdichildfrm.sip b/sip/tdemdi/tdemdichildfrm.sip index bd3c674..e55ac41 100644 --- a/sip/tdemdi/tdemdichildfrm.sip +++ b/sip/tdemdi/tdemdichildfrm.sip @@ -220,7 +220,7 @@ protected: { TQString current_key = it.currentKey (); PyObject *a0 = sipConvertFromInstance (¤t_key, sipClass_TQString, sipTransferObj); - PyObject *a1 = PyInt_FromLong ((long) it.current ()); + PyObject *a1 = PyLong_FromLong ((long) it.current ()); if ((a0 == NULL) || (a1 == NULL) || (PyDict_SetItem (dict, a0, a1) < 0)) { @@ -254,7 +254,7 @@ protected: a0 = (TQString *)sipForceConvertToType(key, sipType_TQString, sipTransferObj, SIP_NOT_NONE, &a0_state, &iserr); - if (iserr || !PyInt_Check(value)) + if (iserr || !PyLong_Check(value)) { if (a0) sipReleaseType(a0, sipType_TQString, a0_state); @@ -264,7 +264,7 @@ protected: return 0; } - a1 = (TQWidget::FocusPolicy) PyInt_AS_LONG (value); + a1 = (TQWidget::FocusPolicy) PyLong_AS_LONG (value); qdict->insert (*a0, &a1); diff --git a/sip/tdeparts/browserextension.sip b/sip/tdeparts/browserextension.sip index a9d47a3..88e3f4c 100644 --- a/sip/tdeparts/browserextension.sip +++ b/sip/tdeparts/browserextension.sip @@ -477,7 +477,7 @@ TQMap<TQCString,int> testTQMapTQCStringInt (TQMap<TQCString,int>); PyObject *ainst; PyObject *binst = NULL; if (((ainst = sipConvertFromNewType(new TQCString (acpp), sipType_TQCString, NULL)) == NULL) - || ((binst = PyInt_FromLong (bcpp)) == NULL) + || ((binst = PyLong_FromLong (bcpp)) == NULL) || (PyDict_SetItem (dict, ainst, binst) < 0)) { Py_XDECREF (ainst); @@ -510,14 +510,14 @@ TQMap<TQCString,int> testTQMapTQCStringInt (TQMap<TQCString,int>); acpp = (TQCString *)sipForceConvertToType(aelem, sipType_TQCString, sipTransferObj, SIP_NOT_NONE|SIP_NO_CONVERTORS, NULL, &iserr); - if (iserr || !PyInt_Check (belem)) + if (iserr || !PyLong_Check (belem)) { *sipIsErr = 1; delete cppmap; return 0; } - bcpp = PyInt_AS_LONG (belem); + bcpp = PyLong_AS_LONG (belem); cppmap->insert (*acpp, bcpp); } diff --git a/sip/tdeui/keditlistbox.sip b/sip/tdeui/keditlistbox.sip index 6fd3391..526db68 100644 --- a/sip/tdeui/keditlistbox.sip +++ b/sip/tdeui/keditlistbox.sip @@ -176,7 +176,7 @@ public: const char **PyTQtListToArray(PyObject *lst) { - int nstr; + SIP_SSIZE_T nstr; const char **str, **sp; nstr = PyList_Size(lst); @@ -190,15 +190,16 @@ const char **PyTQtListToArray(PyObject *lst) for (int i = 0; i < nstr; ++i) { - char *s; + PyObject *item = PyList_GetItem(lst, i); + const char *item_ascii = sipString_AsASCIIString(&item); - if ((s = PyString_AsString(PyList_GetItem(lst,i))) == NULL) + if (item_ascii == NULL) { sipFree((void *)str); return NULL; } - *sp++ = s; + *sp++ = item_ascii; } return str; diff --git a/sip/tdeui/kkeydialog.sip b/sip/tdeui/kkeydialog.sip index 41d8b3a..60e9c28 100644 --- a/sip/tdeui/kkeydialog.sip +++ b/sip/tdeui/kkeydialog.sip @@ -206,7 +206,7 @@ typedef TQDict<int> IntDict; { TQString current_key = it.currentKey (); PyObject *a0 = sipConvertFromInstance (¤t_key, sipClass_TQCString, sipTransferObj); - PyObject *a1 = PyInt_FromLong ((long) it.current ()); + PyObject *a1 = PyLong_FromLong ((long) it.current ()); if ((a0 == NULL) || (a1 == NULL) || (PyDict_SetItem (dict, a0, a1) < 0)) { @@ -240,7 +240,7 @@ typedef TQDict<int> IntDict; a0 = (TQString *)sipForceConvertToType(key, sipType_TQString, sipTransferObj, SIP_NOT_NONE, &a0_state, &iserr); - if ((iserr) || (!PyInt_Check (value))) + if ((iserr) || (!PyLong_Check (value))) { if (a0) sipReleaseType(a0, sipType_TQString, a0_state); @@ -250,7 +250,7 @@ typedef TQDict<int> IntDict; return 0; } - a1 = (int) PyInt_AS_LONG (value); + a1 = (int) PyLong_AS_LONG (value); qdict->insert (*a0, &a1); diff --git a/sip/tdeui/tdemainwindow.sip b/sip/tdeui/tdemainwindow.sip index ea9635a..02e19ed 100644 --- a/sip/tdeui/tdemainwindow.sip +++ b/sip/tdeui/tdemainwindow.sip @@ -76,7 +76,7 @@ public: //ig TQPtrListIterator<TDEToolBar> toolBarIterator (); TDEAccel* accel (); void setFrameBorderWidth (int); - void setAutoSaveSettings (const TQString& = TQString ::fromLatin1 ("MainWindow" ), bool = 1); + void setAutoSaveSettings (const TQString& = TQString ::fromUtf8 ("MainWindow" ), bool = 1); void resetAutoSaveSettings (); %If ( KDE_3_1_0 - ) diff --git a/svnmerge.py b/svnmerge.py index 7b90652..8722806 100644 --- a/svnmerge.py +++ b/svnmerge.py @@ -16,11 +16,11 @@ for file in newfiles: os.system ("cp %s %s" % (os.path.join (newpath, sip), svnpath)) if sip not in svnsip: os.system ("svn add %s" % (os.path.join (svnpath, sip))) - print "added %s" % sip + print("added %s" % sip) else: os.system ("cp -R %s %s" % (newpath, svnpath)) os.system ("svn add %s" % svnpath) - print "added %s" % svnpath + print("added %s" % svnpath) newfiles = os.listdir (os.path.join (newbase, "extra")) @@ -35,11 +35,11 @@ for file in newfiles: os.system ("cp %s %s" % (os.path.join (newpath, extra), svnpath)) if extra not in svnextra: os.system ("svn add %s" % (os.path.join (svnpath, extra))) - print "added %s" % extra + print("added %s" % extra) else: os.system ("cp -R %s %s" % (newpath, svnpath)) os.system ("svn add %s" % svnpath) - print "added %s" % svnpath + print("added %s" % svnpath) files = ["configure.py", "*.prj", "svnm*"] diff --git a/svnmergedocs.py b/svnmergedocs.py index e77a908..349aacb 100644 --- a/svnmergedocs.py +++ b/svnmergedocs.py @@ -16,7 +16,7 @@ for file in newfiles: os.system ("cp %s %s" % (os.path.join (newpath, doc), svnpath)) if doc not in svndoc: os.system ("svn add %s" % (os.path.join (svnpath, doc))) - print "added %s" % doc + print("added %s" % doc) else: os.system ("cp -R %s %s" % (newpath, svnpath)) os.system ("svn add %s" % svnpath) diff --git a/templates/basic/basicapp.py b/templates/basic/basicapp.py index 44858c9..4a897cc 100644 --- a/templates/basic/basicapp.py +++ b/templates/basic/basicapp.py @@ -54,5 +54,5 @@ TDECmdLineArgs.init (sys.argv, aboutData) app = TDEApplication () mainWindow = MainWin (None, "main window") mainWindow.show() -app.connect (app, SIGNAL ("lastWindowClosed ()"), app.quit) +app.connect (app, SIGNAL ("lastWindowClosed()"), app.quit) app.exec_loop() diff --git a/templates/basic/menuapp1.py b/templates/basic/menuapp1.py index 8f2d764..777ec91 100644 --- a/templates/basic/menuapp1.py +++ b/templates/basic/menuapp1.py @@ -36,10 +36,6 @@ copyright holder. """ -False = 0 -True = not False - - import sys from PyTQt.qt import TQPopupMenu, SIGNAL @@ -60,7 +56,7 @@ STATUSBAR_RIGHT = 3 class MainWin (TDEMainWindow): def __init__ (self, *args): - apply (TDEMainWindow.__init__, (self,) + args) + TDEMainWindow.__init__(self, *args) self.initMenus () self.initToolBar () diff --git a/templates/basic/menuapp2.py b/templates/basic/menuapp2.py index 6a3112d..beaa562 100644 --- a/templates/basic/menuapp2.py +++ b/templates/basic/menuapp2.py @@ -35,10 +35,6 @@ copyright holder. """ -False = 0 -True = not False - - import sys from PyTQt.qt import TQPopupMenu, SIGNAL @@ -52,7 +48,7 @@ STATUSBAR_RIGHT = 3 class MainWin (TDEMainWindow): def __init__ (self, *args): - apply (TDEMainWindow.__init__, (self,) + args) + TDEMainWindow.__init__(self, *args) self.initActions () self.initMenus () diff --git a/templates/basic/panelapplet.py b/templates/basic/panelapplet.py index 5c1ee15..caf5b75 100644 --- a/templates/basic/panelapplet.py +++ b/templates/basic/panelapplet.py @@ -31,6 +31,7 @@ dealings in this Software without prior written authorization from the copyright holder. """ +import PyTQt from tdeui import PyKPanelApplet, KPanelApplet diff --git a/templates/basic/systray.py b/templates/basic/systray.py index b4908b6..0e305b8 100644 --- a/templates/basic/systray.py +++ b/templates/basic/systray.py @@ -30,21 +30,32 @@ copyright holder. import sys from PyTQt.qt import TQWidget, SIGNAL -from tdecore import TDEApplication, TDEIcon, TDEIconLoader +from tdecore import TDEApplication, TDEIcon, TDEIconLoader, TDEAboutData, TDECmdLineArgs from tdeui import KSystemTray class MainWin (TQWidget): def __init__ (self, *args): - apply (TQWidget.__init__, (self,) + args) + TQWidget.__init__(self, *args) #-------------------- main ------------------------------------------------ def slotQuitSelected (): - TDEApplication.kApplication ().quit () + TDEApplication.kApplication().quit() -appName = "template" -app = TDEApplication (sys.argv, appName) +version = "1.0" +description = "A basic application template" +ad = TDEAboutData ("template", "Template App",\ + version, description, TDEAboutData.License_GPL_V2,\ + "(C) 2003 whoever the author is") + +ad.addAuthor ("author1", "whatever they did", "email@somedomain") +ad.addAuthor ("author2", "they did something else", "[email protected]") + +TDECmdLineArgs.init(["SysTrayApp"], ad) +TDECmdLineArgs.addCmdLineOptions ([("+files", "File to open", "")]) + +app = TDEApplication() mainWindow = MainWin (None, "main window") icons = TDEIconLoader () |