From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 13 Apr 2011 00:46:47 +0000 Subject: Initial conversion of kdepim to TQt This will probably require some tweaking before it will build under Qt4, however Qt3 builds are OK. Any alterations this commit makes to kdepim behaviour under Qt3 are unintentional and should be fixed. git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kresources/kolab/knotes/kolabresource.desktop | 2 +- kresources/kolab/knotes/note.cpp | 6 +++--- kresources/kolab/knotes/note.h | 6 +++--- kresources/kolab/knotes/resourcekolab.cpp | 8 ++++---- kresources/kolab/knotes/resourcekolab.h | 7 ++++--- kresources/kolab/knotes/resourcekolab_plugin.cpp | 6 +++--- 6 files changed, 18 insertions(+), 17 deletions(-) (limited to 'kresources/kolab/knotes') diff --git a/kresources/kolab/knotes/kolabresource.desktop b/kresources/kolab/knotes/kolabresource.desktop index 317032d17..5a53529dc 100644 --- a/kresources/kolab/knotes/kolabresource.desktop +++ b/kresources/kolab/knotes/kolabresource.desktop @@ -35,7 +35,7 @@ Name[pl]=Serwer IMAP za pośrednictwem KMail Name[pt]=Servidor IMAP via KMail Name[pt_BR]=Servidor IMAP via KMail Name[ru]=Доступ к серверу IMAP через KMail -Name[sk]=IMAP-server pomocou KMail +Name[sk]=IMAP-server potqmocou KMail Name[sl]=Strežnik IMAP preko KMaila Name[sr]=IMAP сервер преко KMail-а Name[sr@Latn]=IMAP server preko KMail-a diff --git a/kresources/kolab/knotes/note.cpp b/kresources/kolab/knotes/note.cpp index 168dae562..e456e43be 100644 --- a/kresources/kolab/knotes/note.cpp +++ b/kresources/kolab/knotes/note.cpp @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kresources/kolab/knotes/note.h b/kresources/kolab/knotes/note.h index 11f4749e1..d61a2009e 100644 --- a/kresources/kolab/knotes/note.h +++ b/kresources/kolab/knotes/note.h @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. diff --git a/kresources/kolab/knotes/resourcekolab.cpp b/kresources/kolab/knotes/resourcekolab.cpp index 38f670871..cf386218a 100644 --- a/kresources/kolab/knotes/resourcekolab.cpp +++ b/kresources/kolab/knotes/resourcekolab.cpp @@ -22,11 +22,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -160,7 +160,7 @@ bool ResourceKolab::save() bool ResourceKolab::addNote( KCal::Journal* journal ) { - return addNote( journal, TQString::null, 0 ); + return addNote( journal, TQString(), 0 ); } KCal::Journal* ResourceKolab::addNote( const TQString& data, const TQString& subresource, diff --git a/kresources/kolab/knotes/resourcekolab.h b/kresources/kolab/knotes/resourcekolab.h index cfeeb0eb6..3b61d6ec9 100644 --- a/kresources/kolab/knotes/resourcekolab.h +++ b/kresources/kolab/knotes/resourcekolab.h @@ -21,11 +21,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. @@ -54,6 +54,7 @@ class KDE_EXPORT ResourceKolab : public ResourceNotes, public ResourceKolabBase { Q_OBJECT + TQ_OBJECT public: ResourceKolab( const KConfig* ); diff --git a/kresources/kolab/knotes/resourcekolab_plugin.cpp b/kresources/kolab/knotes/resourcekolab_plugin.cpp index 772184982..fa187d2b9 100644 --- a/kresources/kolab/knotes/resourcekolab_plugin.cpp +++ b/kresources/kolab/knotes/resourcekolab_plugin.cpp @@ -20,11 +20,11 @@ In addition, as a special exception, the copyright holders give permission to link the code of this program with any edition of - the Qt library by Trolltech AS, Norway (or with modified versions - of Qt that use the same license as Qt), and distribute linked + the TQt library by Trolltech AS, Norway (or with modified versions + of TQt that use the same license as TQt), and distribute linked combinations including the two. You must obey the GNU General Public License in all respects for all of the code used other than - Qt. If you modify this file, you may extend this exception to + TQt. If you modify this file, you may extend this exception to your version of the file, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. -- cgit v1.2.1