4 files changed, 12 insertions, 11 deletions
diff --git a/kresources/scalix/knotes/resourcescalix.cpp b/kresources/scalix/knotes/resourcescalix.cpp
index 5afd6402d..b9d5b54ca 100644
--- a/kresources/scalix/knotes/resourcescalix.cpp
+++ b/kresources/scalix/knotes/resourcescalix.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.
@@ -154,7 +154,7 @@ bool ResourceScalix::save()
 
 bool ResourceScalix::addNote( KCal::Journal* journal )
 {
-  return addNote( journal, TQString::null, 0 );
+  return addNote( journal, TQString(), 0 );
 }
 
 KCal::Journal* ResourceScalix::addNote( const TQString& data, const TQString& subresource,
diff --git a/kresources/scalix/knotes/resourcescalix.h b/kresources/scalix/knotes/resourcescalix.h
index dc8517b68..fc1309b98 100644
--- a/kresources/scalix/knotes/resourcescalix.h
+++ b/kresources/scalix/knotes/resourcescalix.h
@@ -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.
@@ -53,6 +53,7 @@ class KDE_EXPORT ResourceScalix : public ResourceNotes,
                       public ResourceScalixBase
 {
   Q_OBJECT
+  TQ_OBJECT
 
 public:
   ResourceScalix( const KConfig* );
diff --git a/kresources/scalix/knotes/resourcescalix_plugin.cpp b/kresources/scalix/knotes/resourcescalix_plugin.cpp
index 222d5ed68..1cb835567 100644
--- a/kresources/scalix/knotes/resourcescalix_plugin.cpp
+++ b/kresources/scalix/knotes/resourcescalix_plugin.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/scalix/knotes/scalix.desktop b/kresources/scalix/knotes/scalix.desktop
index a573bee8c..82c34afa6 100644
--- a/kresources/scalix/knotes/scalix.desktop
+++ b/kresources/scalix/knotes/scalix.desktop
@@ -16,7 +16,7 @@ Name[nds]=Notizen op Scalix-Server över KMail
 Name[nl]=Notities op Scalix-server via KMail
 Name[pl]=Notatki na serwerze Scalix za pośrednictwem KMaila
 Name[ru]=Заметки на сервере Scalix через KMail
-Name[sk]=Poznámky na Scalix serveri pomocou KMail
+Name[sk]=Poznámky na Scalix serveri potqmocou KMail
 Name[sr]=Белешке на Scalix серверу преко KMail-а
 Name[sr@Latn]=Beleške na Scalix serveru preko KMail-a
 Name[sv]=Anteckningar på Scalix-server via Kmail