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

29 files changed, 155 insertions, 153 deletions

diff --git a/akregator/src/mk4storage/feedstoragemk4impl.cpp b/akregator/src/mk4storage/feedstoragemk4impl.cpp
index a535197f6..ec0fe7b64 100644
--- a/akregator/src/mk4storage/feedstoragemk4impl.cpp
+++ b/akregator/src/mk4storage/feedstoragemk4impl.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "feedstoragemk4impl.h"
@@ -401,7 +401,7 @@ int FeedStorageMK4Impl::status(const TQString& guid)
     return findidx != -1 ? d->pstatus(d->archiveView.GetAt(findidx)) : 0;
 }
 
-void FeedStorageMK4Impl::seStatus(const TQString& guid, int status)
+void FeedStorageMK4Impl::setqStatus(const TQString& guid, int status)
 {
     int findidx = findArticle(guid);
     if (findidx == -1)
@@ -799,7 +799,7 @@ void FeedStorageMK4Impl::copyArticle(const TQString& guid, FeedStorage* source)
     setHash(guid, source->hash(guid));
     setLink(guid, source->link(guid));
     setPubDate(guid, source->pubDate(guid));
-    seStatus(guid, source->status(guid));
+    setqStatus(guid, source->status(guid));
     setTitle(guid, source->title(guid));
     setAuthor(guid, source->author(guid));
 
@@ -846,8 +846,8 @@ void FeedStorageMK4Impl::enclosure(const TQString& guid, bool& hasEnclosure, TQS
     if (findidx == -1)
     {
         hasEnclosure = false;
-        url = TQString::null;
-        type = TQString::null;
+        url = TQString();
+        type = TQString();
         length = -1;
         return;
     }
diff --git a/akregator/src/mk4storage/feedstoragemk4impl.h b/akregator/src/mk4storage/feedstoragemk4impl.h
index df60b29c4..d13f04def 100644
--- a/akregator/src/mk4storage/feedstoragemk4impl.h
+++ b/akregator/src/mk4storage/feedstoragemk4impl.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #ifndef FEEDSTORAGEMK4IMPL_H
 #define FEEDSTORAGEMK4IMPL_H
@@ -46,7 +46,7 @@ class FeedStorageMK4Impl : public FeedStorage
         virtual int lastFetch();
         virtual void setLastFetch(int lastFetch);
 
-        virtual TQStringList articles(const TQString& tag=TQString::null);
+        virtual TQStringList articles(const TQString& tag=TQString());
 
         virtual TQStringList articles(const Category& cat);
 
@@ -69,7 +69,7 @@ class FeedStorageMK4Impl : public FeedStorage
         virtual uint pubDate(const TQString& guid);
         virtual void setPubDate(const TQString& guid, uint pubdate);
         virtual int status(const TQString& guid);
-        virtual void seStatus(const TQString& guid, int status);
+        virtual void setqStatus(const TQString& guid, int status);
         virtual TQString title(const TQString& guid);
         virtual void setTitle(const TQString& guid, const TQString& title);
         virtual TQString description(const TQString& guid);
@@ -80,10 +80,10 @@ class FeedStorageMK4Impl : public FeedStorage
         
         virtual void addTag(const TQString& guid, const TQString& tag);
         virtual void removeTag(const TQString& guid, const TQString& tag);
-        virtual TQStringList tags(const TQString& guid=TQString::null);
+        virtual TQStringList tags(const TQString& guid=TQString());
 
         virtual void addCategory(const TQString& guid, const Category& category);
-        virtual TQValueList<Category> categories(const TQString& guid=TQString::null);
+        virtual TQValueList<Category> categories(const TQString& guid=TQString());
 
         virtual void setAuthor(const TQString& guid, const TQString& author);
         virtual TQString author(const TQString& guid);
diff --git a/akregator/src/mk4storage/metakit/CHANGES b/akregator/src/mk4storage/metakit/CHANGES
index 160c4bad9..1729b493a 100644
--- a/akregator/src/mk4storage/metakit/CHANGES
+++ b/akregator/src/mk4storage/metakit/CHANGES
@@ -203,7 +203,7 @@
 
     Modify some recent patches that were Python 2.2 only so they would
     still work with 2.1. Add a view.properties() method (returning a
-    dict of propname -> Property) for cases where a property is masked
+    dict of propname -> Property) for cases where a property is tqmasked
     by a method name.
 
 2003-03-01    Reverted changes in Mk4py/scxx, avoid Mk4tcl warning
@@ -211,9 +211,9 @@
    One was in SCXX, PWONumber.h - ouch and apologies (jcw).  Changed
    comparison logic in mk4too.cpp (64-bit ints, new code).
 
-2003-02-28    Fixed relaxed layout in Mk4tcl, several Mk4py fixes
+2003-02-28    Fixed relaxed tqlayout in Mk4tcl, several Mk4py fixes
 
-   Use list operators to convert a Tcl layout to MK format.  This used
+   Use list operators to convert a Tcl tqlayout to MK format.  This used
    to crash, Tcl test 6.7 added to verify the fix.  Changed test 3.1 to
    use a different notation for nested defs (^).
 
@@ -298,7 +298,7 @@
 2003-01-24    Fixed cleanup order bug in Mk4tcl
 
    There was a long-standing bug in Mk4tcl, in which cleanup order of
-   MkPath objects caused them to access their MkWorkspace parent even
+   MkPath objects caused them to access their MkWorkspace tqparent even
    though it was already deleted.  This may have caused some of the
    crash-on-exit bugs in the past.
 
@@ -605,13 +605,13 @@
    c4_Storage::SaveTo function, memo's would sometimes not be written,
    leading to a *damaged* datafile (and incorrect free-space tracking).
 
-2002-03-15    Better configure logic, "mk::view layout" fix
+2002-03-15    Better configure logic, "mk::view tqlayout" fix
 
    Many tweaks to configures, makes, and libtool setup.  Get rid of the
    library version numbers and the special Mk4*.so targets.  Instead of
    Mk4tcl.so use libmk4tcl.so (likewise Mk4py.so is now libmk4py.so).
 
-   Fixed "mk::view layout", it was broken by the 10-2-2002 change.
+   Fixed "mk::view tqlayout", it was broken by the 10-2-2002 change.
 
 2002-03-13    Extend partial access 'B' usage
 
@@ -658,9 +658,9 @@
    causing it to detach empty top-level views, even when in use.  Fixed,
    added s39 to test for this case.
 
-2002-02-10    Improve Mk4tcl's "mk::view layout"
+2002-02-10    Improve Mk4tcl's "mk::view tqlayout"
 
-   Avoid crash when asking for the layout of a non-existent view.  Now
+   Avoid crash when asking for the tqlayout of a non-existent view.  Now
    returns an error instead.
 
 2002-02-07    Fast commit with many empty subviews
@@ -996,9 +996,9 @@
     M-solaris.sh and M-dyn.sh scripts need to be manually edited when
     choosing between CC and gcc.
 
-2001-03-27    Double-alignment bug on Solaris
+2001-03-27    Double-tqalignment bug on Solaris
 
-    Two changes (c4_Bytes in mk4.h and src/column.h) to fix an alignment
+    Two changes (c4_Bytes in mk4.h and src/column.h) to fix an tqalignment
     problem for 8-byte doubles on Solaris.  This caused tests b17, b23,
     b24, s22, and s28 to fail.
 
@@ -1084,7 +1084,7 @@
 
 2000-10-03    Fixes for Alpha Unix
 
-    Moved _item in column.h up to fix alignment sensitivity.  Config.h
+    Moved _item in column.h up to fix tqalignment sensitivity.  Config.h
     did not get SIZE_LONG right on Alpha Unix (0?).
 
 2000-09-27    Contributed fixes and Python 2.0b2
@@ -1198,7 +1198,7 @@
 
     Moved C++ member documentation out of "mk4.h" header.  Added
     examples/ directory, with a find.py timing example.  Fixed bugs in
-    new Mk4tcl: "$vw find" and "$vw delete end".  Added tests for new
+    new Mk4tcl: "$vw tqfind" and "$vw delete end".  Added tests for new
     Mk4tcl OO interface: ":mk5object.test".
 
 2000-06-16    Improved modifiable custom viewers
@@ -1614,7 +1614,7 @@
     new version in c4_Sequence allocate the c4_Bytes object lazily.
     Faster, and decreases sequence object size (for lots of subviews).
 
-    Mk4tcl, mk::layout now returns the proper layout even if the views
+    Mk4tcl, mk::tqlayout now returns the proper tqlayout even if the views
     are empty.  Solved by adding extra arg to c4_Storage::Description,
     to return structure of a single top-level view.  Fixes "mk8basic.1",
     and the returned string now has one bogus list layer stripped off.
diff --git a/akregator/src/mk4storage/metakit/README b/akregator/src/mk4storage/metakit/README
index 21edd0fc2..314c956b9 100644
--- a/akregator/src/mk4storage/metakit/README
+++ b/akregator/src/mk4storage/metakit/README
@@ -40,7 +40,7 @@ WEBSITE URLS - The main pages on the world wide web, for news and downloads:
     License info:   http://www.equi4.com/mklicense.html
     Contact info:   http://www.equi4.com/contact.html
 
-ACKNOWLEDGEMENTS - Thanks to everyone who has helped shape and extend Metakit,
+ACKNOWLEDGEMENTS - Thanks to everyone who has helped tqshape and extend Metakit,
     including Kyrill Denisenko, Mark Roseman, Gordon McMillan, Matt Newman,
     Christian Tismer, John Bushakra, Steve Landers, Jacob Levy, John Barnard,
     Nicholas Riley, Brian Kelley, and many more people who have reported bugs
diff --git a/akregator/src/mk4storage/metakit/include/mk4str.h b/akregator/src/mk4storage/metakit/include/mk4str.h
index 88b7a39d6..7124a29ea 100644
--- a/akregator/src/mk4storage/metakit/include/mk4str.h
+++ b/akregator/src/mk4storage/metakit/include/mk4str.h
@@ -96,7 +96,7 @@ d4_inline bool operator== (const char* s1, const c4_String& s2);
 d4_inline bool operator!= (const c4_String& s1, const char* s2);
 d4_inline bool operator!= (const char* s1, const c4_String& s2);
 
-#else                           // Universal tqreplacement classes
+#else                           // Universal replacement classes
 
     /// An efficient string class, modeled after the MFC version
 class c4_String
diff --git a/akregator/src/mk4storage/metakit/include/mk4str.inl b/akregator/src/mk4storage/metakit/include/mk4str.inl
index 4f95fa514..eddbefb8d 100644
--- a/akregator/src/mk4storage/metakit/include/mk4str.inl
+++ b/akregator/src/mk4storage/metakit/include/mk4str.inl
@@ -131,12 +131,12 @@ d4_inline bool c4_String::operator< (const c4_String& str_) const
 
 d4_inline int c4_String::Find(char ch_) const
 {
-    return find(ch_);
+    return tqfind(ch_);
 }
 
 d4_inline int c4_String::ReverseFind(char ch_) const
 {
-    return rfind(ch_);
+    return rtqfind(ch_);
 }
 
 d4_inline int c4_String::FindOneOf(const char* set_) const
@@ -146,7 +146,7 @@ d4_inline int c4_String::FindOneOf(const char* set_) const
 
 d4_inline int c4_String::Find(const char* sub_) const
 {
-    return find(sub_);
+    return tqfind(sub_);
 }
 
 d4_inline c4_String c4_String::SpanIncluding(const char* set_) const
diff --git a/akregator/src/mk4storage/metakit/src/custom.cpp b/akregator/src/mk4storage/metakit/src/custom.cpp
index a6275cea7..6ed1d5ab3 100644
--- a/akregator/src/mk4storage/metakit/src/custom.cpp
+++ b/akregator/src/mk4storage/metakit/src/custom.cpp
@@ -233,7 +233,7 @@ bool c4_CustomViewer::RemoveRows(int, int)
 
 class c4_SliceViewer : public c4_CustomViewer
 {
-  c4_View _parent;
+  c4_View _tqparent;
   int _first, _limit, _step;
 
 public: 
@@ -249,7 +249,7 @@ public:
 };
 
 c4_SliceViewer::c4_SliceViewer (c4_Sequence& seq_, int first_, int limit_, int step_)
-  : _parent (&seq_), _first (first_), _limit (limit_), _step (step_)
+  : _tqparent (&seq_), _first (first_), _limit (limit_), _step (step_)
 {
   d4_assert(_step != 0);
 }
@@ -260,12 +260,12 @@ c4_SliceViewer::~c4_SliceViewer ()
 
 c4_View c4_SliceViewer::GetTemplate()
 {
-  return _parent.Clone(); // could probably return _parent just as well
+  return _tqparent.Clone(); // could probably return _tqparent just as well
 }
 
 int c4_SliceViewer::GetSize()
 {
-  int n = _limit >= 0 ? _limit : _parent.GetSize();
+  int n = _limit >= 0 ? _limit : _tqparent.GetSize();
   if (n < _first)
     n = _first;
 
@@ -277,14 +277,14 @@ bool c4_SliceViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 {
   row_ = _first + _step * (_step > 0 ? row_ : row_ - GetSize() + 1);
 
-  return _parent.GetItem(row_, col_, buf_);
+  return _tqparent.GetItem(row_, col_, buf_);
 }
 
 bool c4_SliceViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
 {
   row_ = _first + _step * (_step > 0 ? row_ : row_ - GetSize() + 1);
 
-  _parent.SetItem(row_, col_, buf_);
+  _tqparent.SetItem(row_, col_, buf_);
   return true;
 }
 
@@ -297,7 +297,7 @@ bool c4_SliceViewer::InsertRows(int pos_, c4_Cursor value_, int count_)
   if (_limit >= 0)
   _limit += count_;
 
-  _parent.InsertAt(pos_, *value_, count_);
+  _tqparent.InsertAt(pos_, *value_, count_);
   return true;
 }
 
@@ -310,7 +310,7 @@ bool c4_SliceViewer::RemoveRows(int pos_, int count_)
   if (_limit >= 0)
   _limit -= count_;
 
-  _parent.RemoveAt(pos_, count_);
+  _tqparent.RemoveAt(pos_, count_);
   return true;
 }
 
@@ -323,7 +323,7 @@ c4_CustomViewer* f4_CustSlice(c4_Sequence& seq_, int first_, int limit_, int ste
 
 class c4_ProductViewer : public c4_CustomViewer
 {
-  c4_View _parent, _argView, _template;
+  c4_View _tqparent, _argView, _template;
 
 public: 
   c4_ProductViewer (c4_Sequence& seq_, const c4_View& view_);
@@ -335,7 +335,7 @@ public:
 };
 
 c4_ProductViewer::c4_ProductViewer (c4_Sequence& seq_, const c4_View& view_)
-  : _parent (&seq_), _argView (view_), _template (_parent.Clone())
+  : _tqparent (&seq_), _argView (view_), _template (_tqparent.Clone())
 {
   for (int i = 0; i < _argView.NumProperties(); ++i)
     _template.AddProperty(_argView.NthProperty(i));
@@ -352,12 +352,12 @@ c4_View c4_ProductViewer::GetTemplate()
 
 int c4_ProductViewer::GetSize()
 {
-  return _parent.GetSize() * _argView.GetSize();
+  return _tqparent.GetSize() * _argView.GetSize();
 }
 
 bool c4_ProductViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 {
-  c4_View v = _parent;
+  c4_View v = _tqparent;
 
   if (col_ < v.NumProperties())
   {
@@ -384,7 +384,7 @@ c4_CustomViewer* f4_CustProduct(c4_Sequence& seq_, const c4_View& view_)
 
 class c4_RemapWithViewer : public c4_CustomViewer
 {
-  c4_View _parent, _argView;
+  c4_View _tqparent, _argView;
 
 public: 
   c4_RemapWithViewer (c4_Sequence& seq_, const c4_View& view_);
@@ -397,7 +397,7 @@ public:
 };
 
 c4_RemapWithViewer::c4_RemapWithViewer (c4_Sequence& seq_, const c4_View& view_)
-  : _parent (&seq_), _argView (view_)
+  : _tqparent (&seq_), _argView (view_)
 {
 }
 
@@ -407,7 +407,7 @@ c4_RemapWithViewer::~c4_RemapWithViewer ()
 
 c4_View c4_RemapWithViewer::GetTemplate()
 {
-  return _parent.Clone(); // could probably return _parent just as well
+  return _tqparent.Clone(); // could probably return _tqparent just as well
 }
 
 int c4_RemapWithViewer::GetSize()
@@ -422,7 +422,7 @@ bool c4_RemapWithViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 
   row_ = ((const c4_IntProp&) map) (_argView[row_]);
 
-  return _parent.GetItem(row_, col_, buf_);
+  return _tqparent.GetItem(row_, col_, buf_);
 }
 
 bool c4_RemapWithViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
@@ -432,7 +432,7 @@ bool c4_RemapWithViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
 
   row_ = ((const c4_IntProp&) map) (_argView[row_]);
 
-  _parent.SetItem(row_, col_, buf_);
+  _tqparent.SetItem(row_, col_, buf_);
   return true;
 }
 
@@ -445,7 +445,7 @@ c4_CustomViewer* f4_CustRemapWith(c4_Sequence& seq_, const c4_View& view_)
 
 class c4_PairViewer : public c4_CustomViewer
 {
-  c4_View _parent, _argView, _template;
+  c4_View _tqparent, _argView, _template;
 
 public: 
   c4_PairViewer (c4_Sequence& seq_, const c4_View& view_);
@@ -460,7 +460,7 @@ public:
 };
 
 c4_PairViewer::c4_PairViewer (c4_Sequence& seq_, const c4_View& view_)
-  : _parent (&seq_), _argView (view_), _template (_parent.Clone())
+  : _tqparent (&seq_), _argView (view_), _template (_tqparent.Clone())
 {
   for (int i = 0; i < _argView.NumProperties(); ++i)
     _template.AddProperty(_argView.NthProperty(i));
@@ -477,12 +477,12 @@ c4_View c4_PairViewer::GetTemplate()
 
 int c4_PairViewer::GetSize()
 {
-  return _parent.GetSize();
+  return _tqparent.GetSize();
 }
 
 bool c4_PairViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 {
-  c4_View v = _parent;
+  c4_View v = _tqparent;
 
   if (col_ >= v.NumProperties())
   {
@@ -496,7 +496,7 @@ bool c4_PairViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 
 bool c4_PairViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
 {
-  c4_View v = _parent;
+  c4_View v = _tqparent;
 
   if (col_ >= v.NumProperties())
   {
@@ -511,14 +511,14 @@ bool c4_PairViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
 
 bool c4_PairViewer::InsertRows(int pos_, c4_Cursor value_, int count_)
 {
-  _parent.InsertAt(pos_, *value_, count_);
+  _tqparent.InsertAt(pos_, *value_, count_);
   _argView.InsertAt(pos_, *value_, count_);
   return true;
 }
 
 bool c4_PairViewer::RemoveRows(int pos_, int count_)
 {
-  _parent.RemoveAt(pos_, count_);
+  _tqparent.RemoveAt(pos_, count_);
   _argView.RemoveAt(pos_, count_);
   return true;
 }
@@ -532,7 +532,7 @@ c4_CustomViewer* f4_CustPair(c4_Sequence& seq_, const c4_View& view_)
 
 class c4_ConcatViewer : public c4_CustomViewer
 {
-  c4_View _parent, _argView;
+  c4_View _tqparent, _argView;
 
 public: 
   c4_ConcatViewer (c4_Sequence& seq_, const c4_View& view_);
@@ -545,7 +545,7 @@ public:
 };
 
 c4_ConcatViewer::c4_ConcatViewer (c4_Sequence& seq_, const c4_View& view_)
-  : _parent (&seq_), _argView (view_)
+  : _tqparent (&seq_), _argView (view_)
 {
 }
 
@@ -555,23 +555,23 @@ c4_ConcatViewer::~c4_ConcatViewer ()
 
 c4_View c4_ConcatViewer::GetTemplate()
 {
-  return _parent.Clone(); // could probably return _parent just as well
+  return _tqparent.Clone(); // could probably return _tqparent just as well
 }
 
 int c4_ConcatViewer::GetSize()
 {
-  return _parent.GetSize() + _argView.GetSize();
+  return _tqparent.GetSize() + _argView.GetSize();
 }
 
 bool c4_ConcatViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 {
-  c4_View v = _parent;
+  c4_View v = _tqparent;
 
-  if (row_ >= _parent.GetSize())
+  if (row_ >= _tqparent.GetSize())
   {
     v = _argView;
-    row_ -= _parent.GetSize();
-    col_ = v.FindProperty(_parent.NthProperty(col_).GetId());
+    row_ -= _tqparent.GetSize();
+    col_ = v.FindProperty(_tqparent.NthProperty(col_).GetId());
     
     if (col_ < 0)
       return false;
@@ -582,13 +582,13 @@ bool c4_ConcatViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 
 bool c4_ConcatViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
 {
-  c4_View v = _parent;
+  c4_View v = _tqparent;
 
-  if (row_ >= _parent.GetSize())
+  if (row_ >= _tqparent.GetSize())
   {
     v = _argView;
-    row_ -= _parent.GetSize();
-    col_ = v.FindProperty(_parent.NthProperty(col_).GetId());
+    row_ -= _tqparent.GetSize();
+    col_ = v.FindProperty(_tqparent.NthProperty(col_).GetId());
     d4_assert(col_ >= 0);
   }
 
@@ -605,7 +605,7 @@ c4_CustomViewer* f4_CustConcat(c4_Sequence& seq_, const c4_View& view_)
 
 class c4_RenameViewer : public c4_CustomViewer
 {
-  c4_View _parent, _template;
+  c4_View _tqparent, _template;
 
 public: 
   c4_RenameViewer (c4_Sequence& seq_, const c4_Property& old_,
@@ -622,11 +622,11 @@ public:
 
 c4_RenameViewer::c4_RenameViewer (c4_Sequence& seq_, const c4_Property& old_,
                            const c4_Property& new_)
-  : _parent (&seq_)
+  : _tqparent (&seq_)
 {
-  for (int i = 0; i < _parent.NumProperties(); ++i)
+  for (int i = 0; i < _tqparent.NumProperties(); ++i)
   {
-    const c4_Property& prop = _parent.NthProperty(i);
+    const c4_Property& prop = _tqparent.NthProperty(i);
     _template.AddProperty(prop.GetId() == old_.GetId() ? new_ : prop);
   }
 }
@@ -642,17 +642,17 @@ c4_View c4_RenameViewer::GetTemplate()
 
 int c4_RenameViewer::GetSize()
 {
-  return _parent.GetSize();
+  return _tqparent.GetSize();
 }
 
 bool c4_RenameViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 {
-  return _parent.GetItem(row_, col_, buf_);
+  return _tqparent.GetItem(row_, col_, buf_);
 }
 
 bool c4_RenameViewer::SetItem(int row_, int col_, const c4_Bytes& buf_)
 {
-  _parent.SetItem(row_, col_, buf_);
+  _tqparent.SetItem(row_, col_, buf_);
   return true;
 }
 
@@ -666,7 +666,7 @@ c4_CustomViewer* f4_CustRename(c4_Sequence& seq_, const c4_Property& old_,
 
 class c4_GroupByViewer : public c4_CustomViewer
 {
-  c4_View _parent, _keys, _sorted, _temp;
+  c4_View _tqparent, _keys, _sorted, _temp;
   c4_Property _result;
   c4_DWordArray _map;
 
@@ -685,9 +685,9 @@ public:
 
 c4_GroupByViewer::c4_GroupByViewer (c4_Sequence& seq_, const c4_View& keys_,
                            const c4_Property& result_)
-  : _parent (&seq_), _keys (keys_), _result (result_)
+  : _tqparent (&seq_), _keys (keys_), _result (result_)
 {
-  _sorted = _parent.SortOn(_keys);
+  _sorted = _tqparent.SortOn(_keys);
   int n = _sorted.GetSize();
 
   c4_Bytes temp;
@@ -804,7 +804,7 @@ c4_CustomViewer* f4_CustGroupBy(c4_Sequence& seq_, const c4_View& template_,
 
 class c4_JoinPropViewer : public c4_CustomViewer
 {
-  c4_View _parent, _template;
+  c4_View _tqparent, _template;
   c4_ViewProp _sub;
   int _subPos, _subWidth;
   c4_DWordArray _base, _offset;
@@ -820,20 +820,20 @@ public:
 
 c4_JoinPropViewer::c4_JoinPropViewer (c4_Sequence& seq_,
                     const c4_ViewProp& sub_, bool outer_)
-  : _parent (&seq_),
-    _sub (sub_), _subPos (_parent.FindProperty(sub_.GetId())), _subWidth (0)
+  : _tqparent (&seq_),
+    _sub (sub_), _subPos (_tqparent.FindProperty(sub_.GetId())), _subWidth (0)
 {
   d4_assert(_subPos >= 0);
 
-  for (int k = 0; k < _parent.NumProperties(); ++k)
+  for (int k = 0; k < _tqparent.NumProperties(); ++k)
   {
     if (k != _subPos)
-      _template.AddProperty(_parent.NthProperty(k));
+      _template.AddProperty(_tqparent.NthProperty(k));
     else  // if there are no rows, then this join does very little anyway
         //! OOPS: if this is an unattached view, then the subviews can differ
-      if (_parent.GetSize() > 0)
+      if (_tqparent.GetSize() > 0)
       {
-        c4_View view = sub_ (_parent[0]);
+        c4_View view = sub_ (_tqparent[0]);
         for (int l = 0; l < view.NumProperties(); ++l)
         {
           _template.AddProperty(view.NthProperty(l));
@@ -845,9 +845,9 @@ c4_JoinPropViewer::c4_JoinPropViewer (c4_Sequence& seq_,
   _base.SetSize(0, 5);
   _offset.SetSize(0, 5);
 
-  for (int i = 0; i < _parent.GetSize(); ++i)
+  for (int i = 0; i < _tqparent.GetSize(); ++i)
   {
-    c4_View v = _sub (_parent[i]);
+    c4_View v = _sub (_tqparent[i]);
 
     int n = v.GetSize();
     if (n == 0 && outer_)
@@ -880,7 +880,7 @@ int c4_JoinPropViewer::GetSize()
 
 bool c4_JoinPropViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 {
-  c4_View v = _parent;
+  c4_View v = _tqparent;
   int r = _base.GetAt(row_);
 
   if (col_ >= _subPos)
@@ -890,7 +890,7 @@ bool c4_JoinPropViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
     }
     else
     {
-      v = _sub (_parent[r]);
+      v = _sub (_tqparent[r]);
       r = _offset.GetAt(row_);
       if (r < 0)
         return false; // if this is a null row in an outer join
@@ -913,7 +913,7 @@ c4_CustomViewer* f4_CustJoinProp(c4_Sequence& seq_,
 
 class c4_JoinViewer : public c4_CustomViewer
 {
-  c4_View _parent, _argView, _template;
+  c4_View _tqparent, _argView, _template;
   c4_DWordArray _base, _offset;
 
 public: 
@@ -928,14 +928,14 @@ public:
 
 c4_JoinViewer::c4_JoinViewer (c4_Sequence& seq_,const c4_View& keys_,
                 const c4_View& view_, bool outer_)
-  : _parent (&seq_), _argView (view_.SortOn(keys_))
+  : _tqparent (&seq_), _argView (view_.SortOn(keys_))
 {
     // why not in GetTemplate, since we don't need to know this...
-  _template = _parent.Clone();
+  _template = _tqparent.Clone();
   for (int l = 0; l < _argView.NumProperties(); ++l)
     _template.AddProperty(_argView.NthProperty(l));
 
-  c4_View sorted = _parent.SortOn(keys_).Project(keys_);
+  c4_View sorted = _tqparent.SortOn(keys_).Project(keys_);
   c4_View temp = _argView.Project(keys_);
 
   _base.SetSize(0, 5);
@@ -945,7 +945,7 @@ c4_JoinViewer::c4_JoinViewer (c4_Sequence& seq_,const c4_View& keys_,
 
   for (int i = 0; i < sorted.GetSize(); ++i)
   {
-    int orig = _parent.GetIndexOf(sorted[i]);
+    int orig = _tqparent.GetIndexOf(sorted[i]);
     d4_assert(orig >= 0);
 
     if (i > 0 && sorted[i] == sorted[i-1])
@@ -1009,7 +1009,7 @@ int c4_JoinViewer::GetSize()
 
 bool c4_JoinViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 {
-  c4_View v = _parent;
+  c4_View v = _tqparent;
   int r = _base.GetAt(row_);
 
   if (col_ >= v.NumProperties())
@@ -1030,7 +1030,7 @@ bool c4_JoinViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 #if 0
 bool c4_JoinViewer::GetItem(int row_, int col_, c4_Bytes& buf_)
 {
-  c4_View v = _parent;
+  c4_View v = _tqparent;
 
   int o = 0;
   int r = _offset.GetAt(row_);
diff --git a/akregator/src/mk4storage/metakit/src/field.cpp b/akregator/src/mk4storage/metakit/src/field.cpp
index 3867d6b5c..ed5a45738 100644
--- a/akregator/src/mk4storage/metakit/src/field.cpp
+++ b/akregator/src/mk4storage/metakit/src/field.cpp
@@ -23,7 +23,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // c4_Field
 
-c4_Field::c4_Field (const char*& description_, c4_Field* parent_)
+c4_Field::c4_Field (const char*& description_, c4_Field* tqparent_)
   : _type (0)
 {
   _indirect = this;
@@ -47,7 +47,7 @@ c4_Field::c4_Field (const char*& description_, c4_Field* parent_)
 
     if (*description_ == '^') {
       ++description_;
-      _indirect = parent_;
+      _indirect = tqparent_;
       d4_assert(*description_ == ']');
     }
 
diff --git a/akregator/src/mk4storage/metakit/src/field.h b/akregator/src/mk4storage/metakit/src/field.h
index 8bf3dc8c6..5dfc25736 100644
--- a/akregator/src/mk4storage/metakit/src/field.h
+++ b/akregator/src/mk4storage/metakit/src/field.h
@@ -34,7 +34,7 @@ public:
   c4_Field& SubField(int) const;
     //: Returns the description of each subfield.
   bool IsRepeating() const;
-    //: Returns true if this field tqcontains subtables.
+    //: Returns true if this field contains subtables.
   
 /* Field name and description */
   const c4_String& Name() const;
diff --git a/akregator/src/mk4storage/metakit/src/format.cpp b/akregator/src/mk4storage/metakit/src/format.cpp
index 49c45bce6..aa23e7391 100644
--- a/akregator/src/mk4storage/metakit/src/format.cpp
+++ b/akregator/src/mk4storage/metakit/src/format.cpp
@@ -1036,7 +1036,7 @@ void c4_FormatV::SetupAllSubviews()
 void c4_FormatV::Define(int rows_, const t4_byte** ptr_)
 {
   if (_inited) {
-    // big oops: a root handler already tqcontains data
+    // big oops: a root handler already contains data
     
     for (int i = 0; i < _subSeqs.GetSize(); ++i)
       ForgetSubview(i);
diff --git a/akregator/src/mk4storage/metakit/src/handler.cpp b/akregator/src/mk4storage/metakit/src/handler.cpp
index 6c68c5c3f..fab473722 100644
--- a/akregator/src/mk4storage/metakit/src/handler.cpp
+++ b/akregator/src/mk4storage/metakit/src/handler.cpp
@@ -78,13 +78,13 @@ void c4_Handler::Move(int from_, int to_)
 // c4_HandlerSeq
 
 c4_HandlerSeq::c4_HandlerSeq (c4_Persist* persist_)
-  : _persist (persist_), _field (0), _parent (0), _numRows (0)
+  : _persist (persist_), _field (0), _tqparent (0), _numRows (0)
 { 
 }
 
 c4_HandlerSeq::c4_HandlerSeq (c4_HandlerSeq& owner_, c4_Handler* handler_)
   : _persist (owner_.Persist()), _field (owner_.FindField(handler_)),
-    _parent (&owner_), _numRows (0)
+    _tqparent (&owner_), _numRows (0)
 { 
   for (int i = 0; i < NumFields(); ++i) {
     c4_Field& field = Field(i);
@@ -98,7 +98,7 @@ c4_HandlerSeq::c4_HandlerSeq (c4_HandlerSeq& owner_, c4_Handler* handler_)
 
 c4_HandlerSeq::~c4_HandlerSeq ()
 {
-  const bool rootLevel = _parent == this;
+  const bool rootLevel = _tqparent == this;
   c4_Persist* pers = _persist;
 
   if (rootLevel && pers != 0)
@@ -129,7 +129,7 @@ c4_Persist* c4_HandlerSeq::Persist() const
 void c4_HandlerSeq::DefineRoot()
 { 
   d4_assert(_field == 0);
-  d4_assert(_parent == 0);
+  d4_assert(_tqparent == 0);
 
   SetNumRows(1);
 
@@ -137,7 +137,7 @@ void c4_HandlerSeq::DefineRoot()
   _field = d4_new c4_Field (desc);
   d4_assert(!*desc);
 
-  _parent = this;
+  _tqparent = this;
 }
 
 c4_Handler* c4_HandlerSeq::CreateHandler(const c4_Property& prop_)
@@ -162,7 +162,7 @@ void c4_HandlerSeq::DetachFromParent()
     _field = 0;
   }
 
-  _parent = 0;
+  _tqparent = 0;
 }
 
 void c4_HandlerSeq::DetachFromStorage(bool full_)
@@ -293,7 +293,7 @@ void c4_HandlerSeq::Restructure(c4_Field& field_, bool remove_)
 	}
     }
 
-  if (_parent == this)
+  if (_tqparent == this)
     delete ofld;  // the root table owns its field structure tree
 }
 
@@ -397,9 +397,9 @@ void c4_HandlerSeq::ExchangeEntries(int srcPos_, c4_HandlerSeq& dst_, int dstPos
       c4_HandlerSeq& t1 = SubEntry(col, srcPos_);
       c4_HandlerSeq& t2 = dst_.SubEntry(col, dstPos_);
 
-        // adjust the parents
-      t1._parent = this;
-      t2._parent = &dst_;
+        // adjust the tqparents
+      t1._tqparent = this;
+      t2._tqparent = &dst_;
 
         // reattach the proper field structures
       t1.Restructure(Field(col), false);
@@ -478,14 +478,14 @@ void c4_HandlerSeq::UnmappedAll()
 
   // construct meta view from a pre-parsed field tree structure
   // this will one day be converted to directly parse the description string
-void c4_HandlerSeq::BuildMeta(int parent_, int colnum_, c4_View& meta_,
+void c4_HandlerSeq::BuildMeta(int tqparent_, int colnum_, c4_View& meta_,
     					const c4_Field& field_)
 {
   c4_IntProp pP ("P"), pC ("C");
   c4_ViewProp pF ("F");
   c4_StringProp pN ("N"), pT ("T");
 
-  int n = meta_.Add(pP [parent_] + pC [colnum_]);
+  int n = meta_.Add(pP [tqparent_] + pC [colnum_]);
   c4_View fields = pF (meta_[n]);
 
   for (int i = 0; i < field_.NumSubFields(); ++i) {
diff --git a/akregator/src/mk4storage/metakit/src/handler.h b/akregator/src/mk4storage/metakit/src/handler.h
index 353d0517a..7cf2efdf6 100644
--- a/akregator/src/mk4storage/metakit/src/handler.h
+++ b/akregator/src/mk4storage/metakit/src/handler.h
@@ -52,7 +52,7 @@ public:
   virtual int ItemSize(int index_) = 0;
     //: Return width of specified data item.
   void GetBytes(int index_, c4_Bytes& buf_, bool copySmall_ =false);
-    //: Used for backward compatibility, should probably be tqreplaced.
+    //: Used for backward compatibility, should probably be replaced.
   virtual const void* Get(int index_, int& length_) = 0;
     //: Retrieves the data item at the specified index.
   virtual void Set(int index_, const c4_Bytes& buf_) = 0;
@@ -88,7 +88,7 @@ class c4_HandlerSeq : public c4_Sequence
   c4_PtrArray _handlers;
   c4_Persist* _persist;
   c4_Field* _field; 
-  c4_HandlerSeq* _parent;
+  c4_HandlerSeq* _tqparent;
   int _numRows;
 
 public:
diff --git a/akregator/src/mk4storage/metakit/src/handler.inl b/akregator/src/mk4storage/metakit/src/handler.inl
index 75321f9c7..10d45f3ce 100644
--- a/akregator/src/mk4storage/metakit/src/handler.inl
+++ b/akregator/src/mk4storage/metakit/src/handler.inl
@@ -84,7 +84,7 @@ d4_inline const c4_Sequence* c4_HandlerSeq::HandlerContext(int) const
 
 d4_inline c4_HandlerSeq& c4_HandlerSeq::Parent() const
 {
-  return *_parent;
+  return *_tqparent;
 }
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/akregator/src/mk4storage/metakit/src/persist.cpp b/akregator/src/mk4storage/metakit/src/persist.cpp
index 743f47576..65a9e94eb 100644
--- a/akregator/src/mk4storage/metakit/src/persist.cpp
+++ b/akregator/src/mk4storage/metakit/src/persist.cpp
@@ -144,7 +144,7 @@ private:
 //      other hand, the allocator does not know the size of used slots.
 //    * Alternate function allows marking a specific range as occupied.
 //    * Allocator can be initialized as either all free or all in-use.
-//    * Allocation info tqcontains only integers, it could be stored.
+//    * Allocation info contains only integers, it could be stored.
 //    * To extend allocated slots: "occupy" extra bytes at the end.
 //    * Generic: can be used for memory, disk files, and array entries.
 
@@ -767,7 +767,7 @@ void c4_SaveContext::SaveIt(c4_HandlerSeq& root_, c4_Allocator** spacePtr_,
 
   * write new skip + commit "tails" at limit (no visible effect on file)
   * overwrite commit tail at end  with a skip to this new one (equivalent)
-  * tqreplace header with one pointing to that internal new one (equivalent)
+  * replace header with one pointing to that internal new one (equivalent)
   * flush (now the file is valid both truncated and not-yet-truncated
 
       end = limit;
diff --git a/akregator/src/mk4storage/metakit/src/remap.cpp b/akregator/src/mk4storage/metakit/src/remap.cpp
index 243eca047..9bc9b440f 100644
--- a/akregator/src/mk4storage/metakit/src/remap.cpp
+++ b/akregator/src/mk4storage/metakit/src/remap.cpp
@@ -79,7 +79,7 @@ public:
 };
 
 /////////////////////////////////////////////////////////////////////////////
-// The following tqcontains code derived froms Python's dictionaries, hence:
+// The following contains code derived froms Python's dictionaries, hence:
 //  Copyright 1991-1995 by Stichting Mathematisch Centrum, Amsterdam,
 //  The Netherlands.
 // Reduced and turned into a fast C++ class by Christian Tismer, hence:
@@ -434,7 +434,7 @@ bool c4_HashViewer::InsertRows(int pos_, c4_Cursor value_, int count_)
   int i = Lookup(value_, n);
   if (i >= 0 && n > 0)
   {
-    _base.SetAt(i, *value_); // tqreplace existing
+    _base.SetAt(i, *value_); // replace existing
     return true;
   }
 
@@ -944,7 +944,7 @@ bool c4_OrderedViewer::InsertRows(int, c4_Cursor value_, int count_)
   else
   {
     d4_assert(i < _base.GetSize());
-    _base.SetAt(i, *value_); // tqreplace existing
+    _base.SetAt(i, *value_); // replace existing
   }
 
   return true;
@@ -1099,7 +1099,7 @@ bool c4_IndexedViewer::InsertRows(int, c4_Cursor value_, int count_)
   else
   {
     d4_assert(i < _base.GetSize());
-    _base.SetAt(i, *value_); // tqreplace existing
+    _base.SetAt(i, *value_); // replace existing
   }
 
   return true;
diff --git a/akregator/src/mk4storage/metakit/src/store.cpp b/akregator/src/mk4storage/metakit/src/store.cpp
index f43bc0e39..3a4583378 100644
--- a/akregator/src/mk4storage/metakit/src/store.cpp
+++ b/akregator/src/mk4storage/metakit/src/store.cpp
@@ -366,7 +366,7 @@ bool c4_Storage::SetAside(c4_Storage& aside_)
 {
   c4_Persist* pers = Persist();
   bool f = pers->SetAside(aside_);
-  // adjust our copy when the root view has been tqreplaced
+  // adjust our copy when the root view has been replaced
   *(c4_View*) this = &pers->Root();
   return f;
 }
@@ -391,7 +391,7 @@ bool c4_Storage::Rollback(bool full_)
 {
   c4_Persist* pers = Persist();
   bool f = Strategy().IsValid() && pers->Rollback(full_);
-  // adjust our copy when the root view has been tqreplaced
+  // adjust our copy when the root view has been replaced
   *(c4_View*) this = &pers->Root();
   return f;
 }
diff --git a/akregator/src/mk4storage/metakit/src/view.cpp b/akregator/src/mk4storage/metakit/src/view.cpp
index 11e384ee7..af2fc9fa2 100644
--- a/akregator/src/mk4storage/metakit/src/view.cpp
+++ b/akregator/src/mk4storage/metakit/src/view.cpp
@@ -44,7 +44,7 @@ public:
  *  On Win32, use a critical section to protect the global symbol table.
  *  Also uses special thread-safe calls to inc/dec all reference counts.
  *
- *  This implementation tqreplaces the previous use of TLS, which cannot
+ *  This implementation replaces the previous use of TLS, which cannot
  *  be used without special tricks in dynamically loaded DLL's, as is
  *  required for OCX/ActiveX use (which uses LoadLibrary).
  *
diff --git a/akregator/src/mk4storage/metakit/tests/ok/f07a.txt b/akregator/src/mk4storage/metakit/tests/ok/f07a.txt
index 79963d7b4..8f3ed2077 100644
--- a/akregator/src/mk4storage/metakit/tests/ok/f07a.txt
+++ b/akregator/src/mk4storage/metakit/tests/ok/f07a.txt
@@ -1,3 +1,3 @@
  VIEW     1 rows = dict:V
     0: subview 'dict'
-   VIEW     0 rows = parent:I index:I view:V
+   VIEW     0 rows = tqparent:I index:I view:V
diff --git a/akregator/src/mk4storage/metakit/tests/regress.h b/akregator/src/mk4storage/metakit/tests/regress.h
index f317bcb26..b5611e574 100644
--- a/akregator/src/mk4storage/metakit/tests/regress.h
+++ b/akregator/src/mk4storage/metakit/tests/regress.h
@@ -24,7 +24,7 @@ int remove(const char*);
 #pragma warning (disable: 4703) // function too large for global optimizations
 
 // also no exceptions in MSVC 1.52 when used with a QuickWin target
-#if defined (_QWINVER) && !defined (q4_NOTHROW)
+#if defined (_TQWINVER) && !defined (q4_NOTHROW)
 #define q4_NOTHROW 1    
 #endif
 #endif
diff --git a/akregator/src/mk4storage/metakit/tests/tformat.cpp b/akregator/src/mk4storage/metakit/tests/tformat.cpp
index ba6e92549..67530b7fd 100644
--- a/akregator/src/mk4storage/metakit/tests/tformat.cpp
+++ b/akregator/src/mk4storage/metakit/tests/tformat.cpp
@@ -207,7 +207,7 @@ void TestFormat()
     c4_View v3 = pView (v2[0]);
       A(v3.GetSize() == 2);
 */
-    #define FORMAT07 "dict[parent:I,index:I,view[name:S,type:S,child:I]]"
+    #define FORMAT07 "dict[tqparent:I,index:I,view[name:S,type:S,child:I]]"
     c4_Storage s1 ("f07a", 1);
     s1.SetStructure(FORMAT07);
 
diff --git a/akregator/src/mk4storage/mk4confwidget.cpp b/akregator/src/mk4storage/mk4confwidget.cpp
index fce697201..788087f87 100644
--- a/akregator/src/mk4storage/mk4confwidget.cpp
+++ b/akregator/src/mk4storage/mk4confwidget.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "mk4config.h"
diff --git a/akregator/src/mk4storage/mk4confwidget.h b/akregator/src/mk4storage/mk4confwidget.h
index e697c21bc..3fd71ebac 100644
--- a/akregator/src/mk4storage/mk4confwidget.h
+++ b/akregator/src/mk4storage/mk4confwidget.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_BACKEND_MK4CONFWIDGET_H
@@ -33,6 +33,7 @@ namespace Backend {
 class MK4ConfWidget : public MK4ConfWidgetBase
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
         
         MK4ConfWidget();
diff --git a/akregator/src/mk4storage/mk4confwidgetbase.ui b/akregator/src/mk4storage/mk4confwidgetbase.ui
index c89602373..cfa37def6 100644
--- a/akregator/src/mk4storage/mk4confwidgetbase.ui
+++ b/akregator/src/mk4storage/mk4confwidgetbase.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>Akregator::Backend::MK4ConfWidgetBase</class>
-<widget class="QDialog">
+<widget class="TQDialog">
     <property name="name">
         <cstring>MK4ConfWidgetBase</cstring>
     </property>
@@ -25,7 +25,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLayoutWidget" row="0" column="0">
+        <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
                 <cstring>tqlayout4</cstring>
             </property>
@@ -33,7 +33,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>cbUseDefault</cstring>
                     </property>
@@ -44,7 +44,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
                         <cstring>tqlayout3</cstring>
                     </property>
@@ -52,7 +52,7 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>label</cstring>
                             </property>
@@ -72,7 +72,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QLayoutWidget" row="1" column="0">
+        <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
                 <cstring>tqlayout4</cstring>
             </property>
@@ -97,7 +97,7 @@
                         </size>
                     </property>
                 </spacer>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonOk</cstring>
                     </property>
@@ -114,7 +114,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonApply</cstring>
                     </property>
@@ -125,7 +125,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton">
+                <widget class="TQPushButton">
                     <property name="name">
                         <cstring>buttonCancel</cstring>
                     </property>
diff --git a/akregator/src/mk4storage/mk4plugin.cpp b/akregator/src/mk4storage/mk4plugin.cpp
index a475a226a..b3493be36 100644
--- a/akregator/src/mk4storage/mk4plugin.cpp
+++ b/akregator/src/mk4storage/mk4plugin.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #include "mk4plugin.h"
diff --git a/akregator/src/mk4storage/mk4plugin.h b/akregator/src/mk4storage/mk4plugin.h
index b512a8096..fc9935a1f 100644
--- a/akregator/src/mk4storage/mk4plugin.h
+++ b/akregator/src/mk4storage/mk4plugin.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef AKREGATOR_BACKEND_MK4PLUGIN_H
diff --git a/akregator/src/mk4storage/storagefactorymk4impl.cpp b/akregator/src/mk4storage/storagefactorymk4impl.cpp
index 09cacc9db..7a9cd0655 100644
--- a/akregator/src/mk4storage/storagefactorymk4impl.cpp
+++ b/akregator/src/mk4storage/storagefactorymk4impl.cpp
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #include "storagefactorymk4impl.h"
 #include "storagemk4impl.h"
diff --git a/akregator/src/mk4storage/storagefactorymk4impl.h b/akregator/src/mk4storage/storagefactorymk4impl.h
index 85afb48ee..799e72ac6 100644
--- a/akregator/src/mk4storage/storagefactorymk4impl.h
+++ b/akregator/src/mk4storage/storagefactorymk4impl.h
@@ -18,8 +18,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef STORAGEFACTORYMK4IMPL_H
diff --git a/akregator/src/mk4storage/storagemk4impl.cpp b/akregator/src/mk4storage/storagemk4impl.cpp
index 8fd93c556..af71d97bb 100644
--- a/akregator/src/mk4storage/storagemk4impl.cpp
+++ b/akregator/src/mk4storage/storagemk4impl.cpp
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 #include "storagemk4impl.h"
 #include "feedstoragemk4impl.h"
@@ -85,7 +85,7 @@ TQString StorageMK4Impl::archivePath() const
 
 StorageMK4Impl::StorageMK4Impl() : d(new StorageMK4ImplPrivate)
 {
-    setArchivePath(TQString::null); // set path to default
+    setArchivePath(TQString()); // set path to default
 }
 
 TQString StorageMK4Impl::defaultArchivePath()
diff --git a/akregator/src/mk4storage/storagemk4impl.h b/akregator/src/mk4storage/storagemk4impl.h
index 37e317646..aa0a92ee1 100644
--- a/akregator/src/mk4storage/storagemk4impl.h
+++ b/akregator/src/mk4storage/storagemk4impl.h
@@ -19,8 +19,8 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
     As a special exception, permission is given to link this program
-    with any edition of Qt, and distribute the resulting executable,
-    without including the source code for Qt in the source distribution.
+    with any edition of TQt, and distribute the resulting executable,
+    without including the source code for TQt in the source distribution.
 */
 
 #ifndef STORAGEMK4IMPL_H
@@ -37,6 +37,7 @@ namespace Backend {
 class StorageMK4Impl : public Storage
 {
     Q_OBJECT
+  TQ_OBJECT
     public:
 
         StorageMK4Impl();     
@@ -50,7 +51,7 @@ class StorageMK4Impl : public Storage
         
         /** sets the directory where the metakit files will be stored.
             
-            @param archivePath the path to the archive, or TQString::null to reset it to the default.
+            @param archivePath the path to the archive, or TQString() to reset it to the default.
          */   
         void setArchivePath(const TQString& archivePath);
 
@@ -105,7 +106,7 @@ class StorageMK4Impl : public Storage
         virtual TQString restoreTagSet() const; 
   
         /** adds all feed storages from a source to this storage
-            existing articles are tqreplaced
+            existing articles are replaced
         */
         virtual void add(Storage* source);